Skip to content

Commit ca9b23e

Browse files
committed
feat: default to single language server for multi-root workspaces
The R languageserver package now supports multi-root workspaces efficiently. This change enables multi-root support when r.lsp.multiServer is disabled and makes it the default.
1 parent 79b70d9 commit ca9b23e

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,8 +1389,8 @@
13891389
},
13901390
"r.lsp.multiServer": {
13911391
"type": "boolean",
1392-
"default": true,
1393-
"markdownDescription": "Use multiple language servers for [multi-root workspaces](https://code.visualstudio.com/docs/editor/multi-root-workspaces). If disabled, only one language server will be used to handle all requests from all workspaces and files."
1392+
"default": false,
1393+
"markdownDescription": "Use multiple language servers for [multi-root workspaces](https://code.visualstudio.com/docs/editor/multi-root-workspaces). If disabled, only one language server will be used to handle all requests from all workspaces and files. Disabling this is recommended if you have a recent version of the R `languageserver` package installed."
13941394
},
13951395
"r.rmarkdown.codeLensCommands": {
13961396
"type": "array",

src/languageService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ export class LanguageService implements Disposable {
318318

319319
const workspaceFolder = workspace.workspaceFolders?.[0];
320320
const cwd = workspaceFolder ? workspaceFolder.uri.fsPath : os.homedir();
321-
self.client = await self.createClient(self.config, documentSelector, cwd, workspaceFolder, self.outputChannel);
321+
self.client = await self.createClient(self.config, documentSelector, cwd, undefined, self.outputChannel);
322322
}
323323
}
324324

0 commit comments

Comments
 (0)