flycheck.cannot_run_workspace

Author: cormacrelf

crates/rust-analyzer/src/flycheck.rs

@@ -168,6 +168,10 @@ pub(crate) struct FlycheckHandle {
     _thread: stdx::thread::JoinHandle,
     id: usize,
     generation: AtomicUsize,
+
+    /// Bit hacky, but this lets us force the use of restart_for_package when the flycheck
+    /// configuration does not support restart_workspace.
+    cannot_run_workspace: bool,
 }
 
 impl FlycheckHandle {
@@ -193,12 +197,21 @@ impl FlycheckHandle {
             manifest_path,
             ws_target_dir,
         );
+
+        let cannot_run_workspace = actor.cannot_run_workspace();
+
         let (sender, receiver) = unbounded::<StateChange>();
         let thread =
             stdx::thread::Builder::new(stdx::thread::ThreadIntent::Worker, format!("Flycheck{id}"))
                 .spawn(move || actor.run(receiver))
                 .expect("failed to spawn thread");
-        FlycheckHandle { id, generation: generation.into(), sender, _thread: thread }
+        FlycheckHandle {
+            id,
+            generation: generation.into(),
+            sender,
+            _thread: thread,
+            cannot_run_workspace,
+        }
     }
 
     /// Schedule a re-start of the cargo check worker to do a workspace wide check.
@@ -214,6 +227,10 @@ impl FlycheckHandle {
             .unwrap();
     }
 
+    pub(crate) fn cannot_run_workspace(&self) -> bool {
+        self.cannot_run_workspace
+    }
+
     /// Schedule a re-start of the cargo check worker to do a package wide check.
     pub(crate) fn restart_for_package(
         &self,
@@ -785,8 +802,15 @@ impl FlycheckActor {
     ) -> Option<Command> {
         let label = match scope {
             FlycheckScope::Workspace => {
-                // self.config_json.workspace_template.as_ref().map(|x| x.to_command())
-                return None;
+                // If the template doesn't contain {label}, then it works for restarting all.
+                //
+                // Might be nice to have: self.config_json.workspace_template.as_ref().map(|x| x.to_command())
+                // But for now this works.
+                //
+                let template = self.config_json.single_template.as_ref()?;
+                let subs =
+                    Substitutions { label: None, saved_file: saved_file.map(|x| x.as_str()) };
+                return subs.substitute(template, self.root.as_path(), &FxHashMap::default());
             }
             FlycheckScope::Package { package: PackageSpecifier::BuildInfo { label }, .. } => {
                 label.as_str()
@@ -802,6 +826,11 @@ impl FlycheckActor {
         subs.substitute(template, self.root.as_path(), &FxHashMap::default())
     }
 
+    fn cannot_run_workspace(&self) -> bool {
+        let fake_path = self.root.join("fake.rs");
+        self.check_command(&FlycheckScope::Workspace, Some(&fake_path), None).is_none()
+    }
+
     /// Construct a `Command` object for checking the user's code. If the user
     /// has specified a custom command with placeholders that we cannot fill,
     /// return None.

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

@@ -467,7 +467,7 @@ fn run_flycheck(state: &mut GlobalState, vfs_path: VfsPath) -> bool {
                         // Find and trigger corresponding flychecks
                         'flychecks: for flycheck in world.flycheck.iter() {
                             for (id, _) in workspace_ids.clone() {
-                                if id == flycheck.id() {
+                                if id == flycheck.id() && !flycheck.cannot_run_workspace() {
                                     workspace_check_triggered = true;
                                     flycheck.restart_workspace(saved_file.clone());
                                     continue 'flychecks;