This repository was archived by the owner on Nov 18, 2022. It is now read-only.
File tree Expand file tree Collapse file tree 3 files changed +3
-17
lines changed Expand file tree Collapse file tree 3 files changed +3
-17
lines changed Original file line number Diff line number Diff line change 1
1
### Unreleased
2
2
3
+ * Remove redundant ` rust-client.nestedMultiRootConfigInOutermost ` setting (originally used to work around non-multi-project limitations)
3
4
* Ignore setting ` rust-client.enableMultiProjectSetup ` (it's always on by default)
4
5
* Fix support for multiple VSCode workspaces
5
6
Original file line number Diff line number Diff line change 227
227
"description" : " Traces the communication between VS Code and the Rust language server." ,
228
228
"scope" : " window"
229
229
},
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
- },
235
230
"rust-client.enableMultiProjectSetup" : {
236
231
"type" : [" boolean" , " null" ],
237
232
"default" : null ,
Original file line number Diff line number Diff line change @@ -98,22 +98,12 @@ function whenOpeningTextDocument(document: TextDocument) {
98
98
return ;
99
99
}
100
100
101
- const uri = document . uri ;
102
- let folder = workspace . getWorkspaceFolder ( uri ) ;
101
+ let folder = workspace . getWorkspaceFolder ( document . uri ) ;
103
102
if ( ! folder ) {
104
103
return ;
105
104
}
106
105
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 ) ;
117
107
118
108
if ( ! folder ) {
119
109
stopSpinner ( `RLS: Cargo.toml missing` ) ;
You can’t perform that action at this time.
0 commit comments