Configure flycheck using workspace.discoverConfig

crates/base-db/src/input.rs

@@ -432,10 +432,15 @@ impl CrateGraph {
 
     /// Returns all transitive reverse dependencies of the given crate,
     /// including the crate itself.
-    pub fn transitive_rev_deps(&self, of: CrateId) -> impl Iterator<Item = CrateId> {
+    ///
+    /// The result is topologically ordered, like [Self::crates_in_topological_order] -- dependencies
+    /// of a crate come before the crate itself. The crate you pass in is first.
+    pub fn transitive_rev_deps(&self, of: CrateId) -> Vec<CrateId> {
+        let mut rev_deps = Vec::new();
+        let mut visited = FxHashSet::default();
+        visited.insert(of);
+        rev_deps.push(of);
         let mut worklist = vec![of];
-        let mut rev_deps = FxHashSet::default();
-        rev_deps.insert(of);
 
         let mut inverted_graph = FxHashMap::<_, Vec<_>>::default();
         self.arena.iter().for_each(|(krate, data)| {
@@ -446,15 +451,16 @@ impl CrateGraph {
 
         while let Some(krate) = worklist.pop() {
             if let Some(krate_rev_deps) = inverted_graph.get(&krate) {
-                krate_rev_deps
-                    .iter()
-                    .copied()
-                    .filter(|&rev_dep| rev_deps.insert(rev_dep))
-                    .for_each(|rev_dep| worklist.push(rev_dep));
+                krate_rev_deps.iter().copied().filter(|&rev_dep| visited.insert(rev_dep)).for_each(
+                    |rev_dep| {
+                        rev_deps.push(rev_dep);
+                        worklist.push(rev_dep);
+                    },
+                );
             }
         }
 
-        rev_deps.into_iter()
+        rev_deps
     }
 
     /// Returns all crates in the graph, sorted in topological order (ie. dependencies of a crate

crates/hir/src/lib.rs

@@ -215,7 +215,7 @@ impl Crate {
         self,
         db: &dyn HirDatabase,
     ) -> impl Iterator<Item = Crate> {
-        db.crate_graph().transitive_rev_deps(self.id).map(|id| Crate { id })
+        db.crate_graph().transitive_rev_deps(self.id).into_iter().map(|id| Crate { id })
     }
 
     pub fn root_module(self) -> Module {

crates/ide/src/lib.rs

@@ -577,7 +577,7 @@ impl Analysis {
 
     /// Returns crates this file belongs too.
     pub fn transitive_rev_deps(&self, crate_id: CrateId) -> Cancellable<Vec<CrateId>> {
-        self.with_db(|db| db.crate_graph().transitive_rev_deps(crate_id).collect())
+        self.with_db(|db| db.crate_graph().transitive_rev_deps(crate_id))
     }
 
     /// Returns crates this file *might* belong too.

crates/project-model/src/project_json.rs

@@ -183,12 +183,11 @@ impl ProjectJson {
         &self.project_root
     }
 
-    pub fn crate_by_root(&self, root: &AbsPath) -> Option<Crate> {
+    pub fn crate_by_root(&self, root: &AbsPath) -> Option<&Crate> {
         self.crates
             .iter()
             .filter(|krate| krate.is_workspace_member)
             .find(|krate| krate.root_module == root)
-            .cloned()
     }
 
     /// Returns the path to the project's manifest, if it exists.
@@ -219,13 +218,17 @@ impl ProjectJson {
     pub fn runnables(&self) -> &[Runnable] {
         &self.runnables
     }
+
+    pub fn runnable_template(&self, kind: RunnableKind) -> Option<&Runnable> {
+        self.runnables().iter().find(|r| r.kind == kind)
+    }
 }
 
 /// A crate points to the root module of a crate and lists the dependencies of the crate. This is
 /// useful in creating the crate graph.
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Crate {
-    pub(crate) display_name: Option<CrateDisplayName>,
+    pub display_name: Option<CrateDisplayName>,
     pub root_module: AbsPathBuf,
     pub(crate) edition: Edition,
     pub(crate) version: Option<String>,
@@ -319,6 +322,10 @@ pub enum RunnableKind {
 
     /// Run a single test.
     TestOne,
+
+    /// Template for checking a target, emitting rustc JSON diagnostics.
+    /// May include {label} which will get the label from the `build` section of a crate.
+    Flycheck,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
@@ -420,6 +427,7 @@ pub struct RunnableData {
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub enum RunnableKindData {
+    Flycheck,
     Check,
     Run,
     TestOne,
@@ -490,6 +498,7 @@ impl From<RunnableKindData> for RunnableKind {
             RunnableKindData::Check => RunnableKind::Check,
             RunnableKindData::Run => RunnableKind::Run,
             RunnableKindData::TestOne => RunnableKind::TestOne,
+            RunnableKindData::Flycheck => RunnableKind::Flycheck,
         }
     }
 }