Merge pull request #18802 from github/redsun82/rust-glob-members

Rust: support glob members in workspaces

rust/extractor/src/rust_analyzer.rs

@@ -3,7 +3,7 @@ use ra_ap_base_db::SourceDatabase;
 use ra_ap_hir::Semantics;
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_load_cargo::{load_workspace_at, LoadCargoConfig, ProcMacroServerChoice};
-use ra_ap_paths::Utf8PathBuf;
+use ra_ap_paths::{AbsPath, Utf8PathBuf};
 use ra_ap_project_model::ProjectManifest;
 use ra_ap_project_model::{CargoConfig, ManifestPath};
 use ra_ap_span::Edition;
@@ -136,6 +136,8 @@ impl<'a> RustAnalyzer<'a> {
 struct CargoManifestMembersSlice {
     #[serde(default)]
     members: Vec<String>,
+    #[serde(default)]
+    exclude: Vec<String>,
 }
 
 #[derive(Deserialize)]
@@ -171,6 +173,12 @@ impl TomlReader {
     }
 }
 
+fn workspace_members_match(workspace_dir: &AbsPath, members: &[String], target: &AbsPath) -> bool {
+    members.iter().any(|p| {
+        glob::Pattern::new(workspace_dir.join(p).as_str()).is_ok_and(|p| p.matches(target.as_str()))
+    })
+}
+
 fn find_workspace(reader: &mut TomlReader, manifest: &ProjectManifest) -> Option<ProjectManifest> {
     let ProjectManifest::CargoToml(cargo) = manifest else {
         return None;
@@ -200,9 +208,12 @@ fn find_workspace(reader: &mut TomlReader, manifest: &ProjectManifest) -> Option
                 if cargo.starts_with(other.parent())
                     && reader.read(other).is_ok_and(|it| {
                         it.workspace.as_ref().is_some_and(|w| {
-                            w.members
-                                .iter()
-                                .any(|m| other.parent().join(m) == cargo.parent())
+                            workspace_members_match(other.parent(), &w.members, cargo.parent())
+                                && !workspace_members_match(
+                                    other.parent(),
+                                    &w.exclude,
+                                    cargo.parent(),
+                                )
                         })
                     }) =>
             {

rust/ql/integration-tests/workspace-with-glob/Cargo.toml

@@ -0,0 +1,4 @@
+[workspace]
+members = [ "*" ]
+exclude = [ "other" ]
+resolver = "2"

rust/ql/integration-tests/workspace-with-glob/exe/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "exe"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+lib = { path = "../lib" }

rust/ql/integration-tests/workspace-with-glob/exe/src/main.rs

@@ -0,0 +1,5 @@
+use lib::hello;
+
+fn main() {
+    hello();
+}

rust/ql/integration-tests/workspace-with-glob/lib/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "lib"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]

rust/ql/integration-tests/workspace-with-glob/lib/src/lib.rs

@@ -0,0 +1,3 @@
+pub fn hello() {
+    println!("Hello, world!");
+}

rust/ql/integration-tests/workspace-with-glob/other/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "other"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]

rust/ql/integration-tests/workspace-with-glob/source_archive.expected

@@ -0,0 +1,3 @@
+exe/src/main.rs
+lib/src/lib.rs
+other/src/lib.rs

rust/ql/integration-tests/workspace-with-glob/steps.expected

@@ -0,0 +1,10 @@
+| Cargo.toml:0:0:0:0 | LoadManifest(Cargo.toml) |
+| exe/src/main.rs:0:0:0:0 | Extract(exe/src/main.rs) |
+| exe/src/main.rs:0:0:0:0 | Parse(exe/src/main.rs) |
+| file://:0:0:0:0 | FindManifests |
+| lib/src/lib.rs:0:0:0:0 | Extract(lib/src/lib.rs) |
+| lib/src/lib.rs:0:0:0:0 | Parse(lib/src/lib.rs) |
+| other/Cargo.toml:0:0:0:0 | LoadManifest(other/Cargo.toml) |
+| other/src/lib.rs:0:0:0:0 | Extract(other/src/lib.rs) |
+| other/src/lib.rs:0:0:0:0 | LoadSource(other/src/lib.rs) |
+| other/src/lib.rs:0:0:0:0 | Parse(other/src/lib.rs) |

rust/ql/integration-tests/workspace-with-glob/steps.ql

@@ -0,0 +1,4 @@
+import codeql.rust.elements.internal.ExtractorStep
+
+from ExtractorStep step
+select step

rust/ql/integration-tests/workspace-with-glob/test_workspace.py

@@ -0,0 +1,5 @@
+import pytest
+
+
+def test_cargo(codeql, rust, check_source_archive):
+    codeql.database.create()