about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-10-03 14:58:28 +0000
committerGitHub <noreply@github.com>2021-10-03 14:58:28 +0000
commit4b7675fcc30d3e2c05eafc68a5724db66b58142c (patch)
treeb3bd7fa6f22fbb4445e550e46263c73df24c44d5
parent10eaa5a0afc750ad4c009bc2f3276d3413c32b5f (diff)
parentf5c9204ff23c1f7d98c583a5fd35227625d2e57d (diff)
downloadrust-4b7675fcc30d3e2c05eafc68a5724db66b58142c.tar.gz
rust-4b7675fcc30d3e2c05eafc68a5724db66b58142c.zip
Merge #10442
10442: fix: Limit depth to 1 when searching for `Cargo.toml` r=matklad a=lnicola

...and add `rust-project.json`.

More or less fixes #7268

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
-rw-r--r--editors/code/package.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index 5f38d1c1262..4ca93b17bc3 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -65,7 +65,8 @@
         "onCommand:rust-analyzer.analyzerStatus",
         "onCommand:rust-analyzer.memoryUsage",
         "onCommand:rust-analyzer.reloadWorkspace",
-        "workspaceContains:**/Cargo.toml"
+        "workspaceContains:*/Cargo.toml",
+        "workspaceContains:*/rust-project.json"
     ],
     "main": "./out/main",
     "contributes": {