Skip to content
This repository was archived by the owner on Nov 18, 2022. It is now read-only.

Commit c0d6451

Browse files
committed
Remove redundant nestedMultiRootConfigInOutermost setting
1 parent 9e41eda commit c0d6451

File tree

3 files changed

+3
-17
lines changed

3 files changed

+3
-17
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
### Unreleased
22

3+
* Remove redundant `rust-client.nestedMultiRootConfigInOutermost` setting (originally used to work around non-multi-project limitations)
34
* Ignore setting `rust-client.enableMultiProjectSetup` (it's always on by default)
45
* Fix support for multiple VSCode workspaces
56

package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,6 @@
227227
"description": "Traces the communication between VS Code and the Rust language server.",
228228
"scope": "window"
229229
},
230-
"rust-client.nestedMultiRootConfigInOutermost": {
231-
"type": "boolean",
232-
"default": true,
233-
"description": "If one root workspace folder is nested in another root folder, look for the Rust config in the outermost root."
234-
},
235230
"rust-client.enableMultiProjectSetup": {
236231
"type": ["boolean", "null"],
237232
"default": null,

src/extension.ts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,22 +98,12 @@ function whenOpeningTextDocument(document: TextDocument) {
9898
return;
9999
}
100100

101-
const uri = document.uri;
102-
let folder = workspace.getWorkspaceFolder(uri);
101+
let folder = workspace.getWorkspaceFolder(document.uri);
103102
if (!folder) {
104103
return;
105104
}
106105

107-
const inMultiProjectMode = true;
108-
const inNestedOuterProjectMode = workspace
109-
.getConfiguration()
110-
.get<boolean>('rust-client.nestedMultiRootConfigInOutermost', true);
111-
112-
if (inMultiProjectMode) {
113-
folder = nearestParentWorkspace(folder, document.uri.fsPath);
114-
} else if (inNestedOuterProjectMode) {
115-
folder = getOuterMostWorkspaceFolder(folder);
116-
}
106+
folder = nearestParentWorkspace(folder, document.uri.fsPath);
117107

118108
if (!folder) {
119109
stopSpinner(`RLS: Cargo.toml missing`);

0 commit comments

Comments
 (0)