Skip to content

Commit b6b06cf

Browse files
osiewiczosiewicz
authored
lsp: Send DidOpen notifications when changing selections in multi buffer (#22958)
Fixes #22773 Release Notes: - Fixed an edge case with multibuffers that could break language features within them.
1 parent f700268 commit b6b06cf

File tree

5 files changed

+54
-34
lines changed

5 files changed

+54
-34
lines changed

‎crates/diagnostics/src/diagnostics_tests.rs

+17-17
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use std::{
1818
path::{Path, PathBuf},
1919
};
2020
use unindent::Unindent as _;
21-
use util::{post_inc, RandomCharIter};
21+
use util::{path, post_inc, RandomCharIter};
2222

2323
#[ctor::ctor]
2424
fn init_logger() {
@@ -33,7 +33,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
3333

3434
let fs = FakeFs::new(cx.executor());
3535
fs.insert_tree(
36-
"/test",
36+
path!("/test"),
3737
json!({
3838
"consts.rs": "
3939
const a: i32 = 'a';
@@ -59,7 +59,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
5959
.await;
6060

6161
let language_server_id = LanguageServerId(0);
62-
let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
62+
let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
6363
let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
6464
let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6565
let cx = &mut VisualTestContext::from_window(*window, cx);
@@ -70,7 +70,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
7070
lsp_store
7171
.update_diagnostic_entries(
7272
language_server_id,
73-
PathBuf::from("/test/main.rs"),
73+
PathBuf::from(path!("/test/main.rs")),
7474
None,
7575
vec![
7676
DiagnosticEntry {
@@ -234,7 +234,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
234234
lsp_store
235235
.update_diagnostic_entries(
236236
language_server_id,
237-
PathBuf::from("/test/consts.rs"),
237+
PathBuf::from(path!("/test/consts.rs")),
238238
None,
239239
vec![DiagnosticEntry {
240240
range: Unclipped(PointUtf16::new(0, 15))..Unclipped(PointUtf16::new(0, 15)),
@@ -341,7 +341,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
341341
lsp_store
342342
.update_diagnostic_entries(
343343
language_server_id,
344-
PathBuf::from("/test/consts.rs"),
344+
PathBuf::from(path!("/test/consts.rs")),
345345
None,
346346
vec![
347347
DiagnosticEntry {
@@ -464,7 +464,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
464464

465465
let fs = FakeFs::new(cx.executor());
466466
fs.insert_tree(
467-
"/test",
467+
path!("/test"),
468468
json!({
469469
"main.js": "
470470
a();
@@ -479,7 +479,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
479479

480480
let server_id_1 = LanguageServerId(100);
481481
let server_id_2 = LanguageServerId(101);
482-
let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
482+
let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
483483
let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
484484
let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
485485
let cx = &mut VisualTestContext::from_window(*window, cx);
@@ -504,7 +504,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
504504
lsp_store
505505
.update_diagnostic_entries(
506506
server_id_1,
507-
PathBuf::from("/test/main.js"),
507+
PathBuf::from(path!("/test/main.js")),
508508
None,
509509
vec![DiagnosticEntry {
510510
range: Unclipped(PointUtf16::new(0, 0))..Unclipped(PointUtf16::new(0, 1)),
@@ -557,7 +557,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
557557
lsp_store
558558
.update_diagnostic_entries(
559559
server_id_2,
560-
PathBuf::from("/test/main.js"),
560+
PathBuf::from(path!("/test/main.js")),
561561
None,
562562
vec![DiagnosticEntry {
563563
range: Unclipped(PointUtf16::new(1, 0))..Unclipped(PointUtf16::new(1, 1)),
@@ -619,7 +619,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
619619
lsp_store
620620
.update_diagnostic_entries(
621621
server_id_1,
622-
PathBuf::from("/test/main.js"),
622+
PathBuf::from(path!("/test/main.js")),
623623
None,
624624
vec![DiagnosticEntry {
625625
range: Unclipped(PointUtf16::new(2, 0))..Unclipped(PointUtf16::new(2, 1)),
@@ -638,7 +638,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
638638
lsp_store
639639
.update_diagnostic_entries(
640640
server_id_2,
641-
PathBuf::from("/test/main.rs"),
641+
PathBuf::from(path!("/test/main.rs")),
642642
None,
643643
vec![],
644644
cx,
@@ -689,7 +689,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
689689
lsp_store
690690
.update_diagnostic_entries(
691691
server_id_2,
692-
PathBuf::from("/test/main.js"),
692+
PathBuf::from(path!("/test/main.js")),
693693
None,
694694
vec![DiagnosticEntry {
695695
range: Unclipped(PointUtf16::new(3, 0))..Unclipped(PointUtf16::new(3, 1)),
@@ -755,9 +755,9 @@ async fn test_random_diagnostics(cx: &mut TestAppContext, mut rng: StdRng) {
755755
.unwrap_or(10);
756756

757757
let fs = FakeFs::new(cx.executor());
758-
fs.insert_tree("/test", json!({})).await;
758+
fs.insert_tree(path!("/test"), json!({})).await;
759759

760-
let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
760+
let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
761761
let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
762762
let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
763763
let cx = &mut VisualTestContext::from_window(*window, cx);
@@ -817,7 +817,7 @@ async fn test_random_diagnostics(cx: &mut TestAppContext, mut rng: StdRng) {
817817
// insert a set of diagnostics for a new path
818818
_ => {
819819
let path: PathBuf =
820-
format!("/test/{}.rs", post_inc(&mut next_filename)).into();
820+
format!(path!("/test/{}.rs"), post_inc(&mut next_filename)).into();
821821
let len = rng.gen_range(128..256);
822822
let content =
823823
RandomCharIter::new(&mut rng).take(len).collect::<String>();
@@ -891,7 +891,7 @@ async fn test_random_diagnostics(cx: &mut TestAppContext, mut rng: StdRng) {
891891
for diagnostic in diagnostics {
892892
let found_excerpt = reference_excerpts.iter().any(|info| {
893893
let row_range = info.range.context.start.row..info.range.context.end.row;
894-
info.path == path.strip_prefix("/test").unwrap()
894+
info.path == path.strip_prefix(path!("/test")).unwrap()
895895
&& info.language_server == language_server_id
896896
&& row_range.contains(&diagnostic.range.start.0.row)
897897
});

‎crates/editor/src/editor.rs

+16-1
Original file line numberDiff line numberDiff line change
@@ -1793,7 +1793,7 @@ impl Editor {
17931793
self.collapse_matches = collapse_matches;
17941794
}
17951795

1796-
pub fn register_buffers_with_language_servers(&mut self, cx: &mut Context<Self>) {
1796+
fn register_buffers_with_language_servers(&mut self, cx: &mut Context<Self>) {
17971797
let buffers = self.buffer.read(cx).all_buffers();
17981798
let Some(lsp_store) = self.lsp_store(cx) else {
17991799
return;
@@ -2020,6 +2020,21 @@ impl Editor {
20202020
None
20212021
}
20222022
};
2023+
if let Some(buffer_id) = new_cursor_position.buffer_id {
2024+
if !self.registered_buffers.contains_key(&buffer_id) {
2025+
if let Some(lsp_store) = self.lsp_store(cx) {
2026+
lsp_store.update(cx, |lsp_store, cx| {
2027+
let Some(buffer) = self.buffer.read(cx).buffer(buffer_id) else {
2028+
return;
2029+
};
2030+
self.registered_buffers.insert(
2031+
buffer_id,
2032+
lsp_store.register_buffer_with_language_servers(&buffer, cx),
2033+
);
2034+
})
2035+
}
2036+
}
2037+
}
20232038

20242039
if let Some(completion_menu) = completion_menu {
20252040
let cursor_position = new_cursor_position.to_offset(buffer);

‎crates/editor/src/editor_tests.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -14875,15 +14875,15 @@ async fn test_multi_buffer_folding(cx: &mut gpui::TestAppContext) {
1487514875

1487614876
let fs = FakeFs::new(cx.executor());
1487714877
fs.insert_tree(
14878-
"/a",
14878+
path!("/a"),
1487914879
json!({
1488014880
"first.rs": sample_text_1,
1488114881
"second.rs": sample_text_2,
1488214882
"third.rs": sample_text_3,
1488314883
}),
1488414884
)
1488514885
.await;
14886-
let project = Project::test(fs, ["/a".as_ref()], cx).await;
14886+
let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
1488714887
let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
1488814888
let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
1488914889
let worktree = project.update(cx, |project, cx| {
@@ -15059,15 +15059,15 @@ async fn test_multi_buffer_single_excerpts_folding(cx: &mut gpui::TestAppContext
1505915059

1506015060
let fs = FakeFs::new(cx.executor());
1506115061
fs.insert_tree(
15062-
"/a",
15062+
path!("/a"),
1506315063
json!({
1506415064
"first.rs": sample_text_1,
1506515065
"second.rs": sample_text_2,
1506615066
"third.rs": sample_text_3,
1506715067
}),
1506815068
)
1506915069
.await;
15070-
let project = Project::test(fs, ["/a".as_ref()], cx).await;
15070+
let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
1507115071
let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
1507215072
let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
1507315073
let worktree = project.update(cx, |project, cx| {
@@ -15206,13 +15206,13 @@ async fn test_multi_buffer_with_single_excerpt_folding(cx: &mut gpui::TestAppCon
1520615206

1520715207
let fs = FakeFs::new(cx.executor());
1520815208
fs.insert_tree(
15209-
"/a",
15209+
path!("/a"),
1521015210
json!({
1521115211
"main.rs": sample_text,
1521215212
}),
1521315213
)
1521415214
.await;
15215-
let project = Project::test(fs, ["/a".as_ref()], cx).await;
15215+
let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
1521615216
let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
1521715217
let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
1521815218
let worktree = project.update(cx, |project, cx| {

‎crates/project/src/lsp_store.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1977,7 +1977,12 @@ impl LocalLspStore {
19771977
Some(local) => local.abs_path(cx),
19781978
None => return,
19791979
};
1980-
let file_url = lsp::Url::from_file_path(old_path).unwrap();
1980+
let file_url = lsp::Url::from_file_path(old_path.as_path()).unwrap_or_else(|_| {
1981+
panic!(
1982+
"`{}` is not parseable as an URI",
1983+
old_path.to_string_lossy()
1984+
)
1985+
});
19811986
self.unregister_buffer_from_language_servers(buffer, file_url, cx);
19821987
}
19831988

‎crates/search/src/project_search.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -2197,7 +2197,7 @@ pub mod tests {
21972197

21982198
let fs = FakeFs::new(cx.background_executor.clone());
21992199
fs.insert_tree(
2200-
"/dir",
2200+
path!("/dir"),
22012201
json!({
22022202
"one.rs": "const ONE: usize = 1;",
22032203
"two.rs": "const TWO: usize = one::ONE + one::ONE;",
@@ -2206,7 +2206,7 @@ pub mod tests {
22062206
}),
22072207
)
22082208
.await;
2209-
let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
2209+
let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
22102210
let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
22112211
let workspace = window.root(cx).unwrap();
22122212
let search = cx.new(|cx| ProjectSearch::new(project.clone(), cx));
@@ -2564,7 +2564,7 @@ pub mod tests {
25642564

25652565
let fs = FakeFs::new(cx.background_executor.clone());
25662566
fs.insert_tree(
2567-
"/dir",
2567+
path!("/dir"),
25682568
json!({
25692569
"one.rs": "const ONE: usize = 1;",
25702570
"two.rs": "const TWO: usize = one::ONE + one::ONE;",
@@ -2573,7 +2573,7 @@ pub mod tests {
25732573
}),
25742574
)
25752575
.await;
2576-
let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
2576+
let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
25772577
let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
25782578
let workspace = window;
25792579
let search_bar = window.build_entity(cx, |_, _| ProjectSearchBar::new());
@@ -2859,7 +2859,7 @@ pub mod tests {
28592859

28602860
let fs = FakeFs::new(cx.background_executor.clone());
28612861
fs.insert_tree(
2862-
"/dir",
2862+
path!("/dir"),
28632863
json!({
28642864
"a": {
28652865
"one.rs": "const ONE: usize = 1;",
@@ -2984,7 +2984,7 @@ pub mod tests {
29842984

29852985
let fs = FakeFs::new(cx.background_executor.clone());
29862986
fs.insert_tree(
2987-
"/dir",
2987+
path!("/dir"),
29882988
json!({
29892989
"one.rs": "const ONE: usize = 1;",
29902990
"two.rs": "const TWO: usize = one::ONE + one::ONE;",
@@ -2993,7 +2993,7 @@ pub mod tests {
29932993
}),
29942994
)
29952995
.await;
2996-
let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
2996+
let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
29972997
let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
29982998
let workspace = window.root(cx).unwrap();
29992999
let search_bar = window.build_entity(cx, |_, _| ProjectSearchBar::new());
@@ -3693,7 +3693,7 @@ pub mod tests {
36933693
// We need many lines in the search results to be able to scroll the window
36943694
let fs = FakeFs::new(cx.background_executor.clone());
36953695
fs.insert_tree(
3696-
"/dir",
3696+
path!("/dir"),
36973697
json!({
36983698
"1.txt": "\n\n\n\n\n A \n\n\n\n\n",
36993699
"2.txt": "\n\n\n\n\n A \n\n\n\n\n",
@@ -3718,7 +3718,7 @@ pub mod tests {
37183718
}),
37193719
)
37203720
.await;
3721-
let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
3721+
let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
37223722
let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
37233723
let workspace = window.root(cx).unwrap();
37243724
let search = cx.new(|cx| ProjectSearch::new(project, cx));

0 commit comments

Comments
 (0)