Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Fix LSP workspace folders for single-file worktrees (#60753)
MostlyK0418cb5b60e8
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rsindex d02ef6685b9..6c7c4a2b182 100644--- a/crates/project/src/lsp_store.rs+++ b/crates/project/src/lsp_store.rs@@ -365,6 +365,21 @@ pub struct LocalLspStore {_background_diagnostics_worker: Shared<Task<()>>,}+fn workspace_folder_uri(worktree: &Worktree, path: &RelPath) -> Option<Uri> {+ if !worktree.entry_for_path(path)?.is_dir() {+ return None;+ }++ let absolute_path = worktree.absolutize(path);+ match Uri::from_file_path(&absolute_path) {+ Ok(uri) => Some(uri),+ Err(()) => {+ log::error!("{absolute_path:?} is not a valid URI");+ None+ }+ }+}+impl LocalLspStore {/// Returns the running language server for the given ID. Note if the language server is starting, it will not be returned.pub fn running_language_server_for_id(@@ -3221,7 +3236,7 @@ impl LocalLspStore {let path = &disposition.path;{- let uri = Uri::from_file_path(worktree.read(cx).absolutize(&path.path));+ let workspace_folder = workspace_folder_uri(worktree.read(cx), &path.path);let server_id = self.get_or_insert_language_server(&worktree,@@ -3232,9 +3247,9 @@ impl LocalLspStore {);if let Some(state) = self.language_servers.get(&server_id)- && let Ok(uri) = uri+ && let Some(workspace_folder) = workspace_folder{- state.add_workspace_folder(uri);+ state.add_workspace_folder(workspace_folder);};server_id}@@ -6448,7 +6463,8 @@ impl LspStore {}let server_id = node.server_id_or_init(|disposition| {let path = &disposition.path;- let uri = Uri::from_file_path(worktree.read(cx).absolutize(&path.path));+ let workspace_folder =+ workspace_folder_uri(worktree.read(cx), &path.path);let key = LanguageServerSeed {worktree_id,name: disposition.server_name.clone(),@@ -6475,9 +6491,9 @@ impl LspStore {cx,);if let Some(state) = local.language_servers.get(&server_id)- && let Ok(uri) = uri+ && let Some(workspace_folder) = workspace_folder{- state.add_workspace_folder(uri);+ state.add_workspace_folder(workspace_folder);};server_id});diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rsindex c8bba3142d7..164616bc2f8 100644--- a/crates/project/tests/integration/project_tests.rs+++ b/crates/project/tests/integration/project_tests.rs@@ -1354,6 +1354,42 @@ async fn test_fallback_to_single_worktree_tasks(cx: &mut gpui::TestAppContext) {);}+#[gpui::test]+async fn test_single_file_worktree_is_not_an_lsp_workspace_folder(cx: &mut gpui::TestAppContext) {+ init_test(cx);+ let fs = FakeFs::new(cx.executor());+ fs.insert_tree(+ path!("/the-root"),+ json!({+ "main.py": "",+ "pyproject.toml": ""+ }),+ )+ .await;++ let project = Project::test(fs.clone(), [path!("/the-root/main.py").as_ref()], cx).await;+ let language_registry = project.read_with(cx, |project, _| project.languages().clone());+ let mut fake_python_servers = language_registry.register_fake_lsp(+ "Python",+ FakeLspAdapter {+ name: "ty",+ ..Default::default()+ },+ );+ language_registry.add(python_lang(fs));++ let (_buffer, _handle) = project+ .update(cx, |project, cx| {+ project.open_local_buffer_with_lsp(path!("/the-root/main.py"), cx)+ })+ .await+ .unwrap();+ let fake_server = fake_python_servers.next().await.unwrap();+ cx.run_until_parked();++ assert_eq!(fake_server.server.workspace_folders(), BTreeSet::new());+}+#[gpui::test]async fn test_running_multiple_instances_of_a_single_server_in_one_worktree(cx: &mut gpui::TestAppContext,