]> git.lizzy.rs Git - rust.git/commitdiff
Don't discover workspaces when detached files are given
authorKirill Bulatov <mail4score@gmail.com>
Sun, 23 May 2021 21:09:24 +0000 (00:09 +0300)
committerKirill Bulatov <mail4score@gmail.com>
Sun, 23 May 2021 21:09:24 +0000 (00:09 +0300)
crates/rust-analyzer/src/bin/main.rs

index 7ee35d52b3c3f1f25a4ceebf8710b938898c2ce4..6c883dd58bd8059475ac45ddb9b444baf246b569 100644 (file)
@@ -199,7 +199,7 @@ fn run_server() -> Result<()> {
             config.update(json);
         }
 
-        if config.linked_projects().is_empty() {
+        if config.linked_projects().is_empty() && config.detached_files().is_empty() {
             let workspace_roots = initialize_params
                 .workspace_folders
                 .map(|workspaces| {
@@ -214,10 +214,9 @@ fn run_server() -> Result<()> {
 
             let discovered = ProjectManifest::discover_all(&workspace_roots);
             log::info!("discovered projects: {:?}", discovered);
-            if discovered.is_empty() && config.detached_files().is_empty() {
+            if discovered.is_empty() {
                 log::error!("failed to find any projects in {:?}", workspace_roots);
             }
-
             config.discovered_projects = Some(discovered);
         }