fix: make reload workspace work with disabled auto cargo config reload

Author: cynecx

crates/rust-analyzer/src/global_state.rs

@@ -346,6 +346,7 @@ impl GlobalState {
                         &path,
                         file.kind(),
                         &additional_files,
+                        &self.config,
                     ) {
                         trace!(?path, kind = ?file.kind(), "refreshing for a change");
                         workspace_structure_change.get_or_insert((path.clone(), false));

crates/rust-analyzer/src/handlers/notification.rs

@@ -177,7 +177,12 @@ pub(crate) fn handle_did_save_text_document(
 
             // FIXME: We should move this check into a QueuedTask and do semantic resolution of
             // the files. There is only so much we can tell syntactically from the path.
-            if reload::should_refresh_for_change(path, ChangeKind::Modify, additional_files) {
+            if reload::should_refresh_for_change(
+                path,
+                ChangeKind::Modify,
+                additional_files,
+                &state.config,
+            ) {
                 state.fetch_workspaces_queue.request_op(
                     format!("workspace vfs file change saved {path}"),
                     FetchWorkspaceRequest {

crates/rust-analyzer/src/main_loop.rs

@@ -491,14 +491,10 @@ impl GlobalState {
             }
         }
 
-        if self.config.cargo_autoreload_config(None)
-            || self.config.discover_workspace_config().is_some()
+        if let Some((cause, FetchWorkspaceRequest { path, force_crate_graph_reload })) =
+            self.fetch_workspaces_queue.should_start_op()
         {
-            if let Some((cause, FetchWorkspaceRequest { path, force_crate_graph_reload })) =
-                self.fetch_workspaces_queue.should_start_op()
-            {
-                self.fetch_workspaces(cause, path, force_crate_graph_reload);
-            }
+            self.fetch_workspaces(cause, path, force_crate_graph_reload);
         }
 
         if !self.fetch_workspaces_queue.op_in_progress() {

crates/rust-analyzer/src/reload.rs

@@ -920,6 +920,7 @@ pub(crate) fn should_refresh_for_change(
     path: &AbsPath,
     change_kind: ChangeKind,
     additional_paths: &[&str],
+    config: &Config,
 ) -> bool {
     const IMPLICIT_TARGET_FILES: &[&str] = &["build.rs", "src/main.rs", "src/lib.rs"];
     const IMPLICIT_TARGET_DIRS: &[&str] = &["src/bin", "examples", "tests", "benches"];
@@ -929,8 +930,10 @@ pub(crate) fn should_refresh_for_change(
         None => return false,
     };
 
-    if let "Cargo.toml" | "Cargo.lock" = file_name {
-        return true;
+    if config.cargo_autoreload_config(None) {
+        if let "Cargo.toml" | "Cargo.lock" = file_name {
+            return true;
+        }
     }
 
     if additional_paths.contains(&file_name) {