Skip to content

Add r.lsp.multiServer setting #1375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renkun-ken merged 6 commits into from
Jun 9, 2023
Merged

Add r.lsp.multiServer setting #1375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed8866e
Use single language server and client
renkun-ken May 30, 2023
4530295
Add r.lsp.multiServer setting
renkun-ken May 30, 2023
214dd73
Update setting description
renkun-ken May 30, 2023
57ab67b
Update setting description
renkun-ken Jun 9, 2023
3c6ae43
Update startLanguageService
renkun-ken Jun 9, 2023
9717a98
Update stopLanguageService
renkun-ken Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1506,6 +1506,11 @@
"default": false,
"description": "Use STDIO connection instead of TCP. (Unix/macOS users only)"
},
"r.lsp.multiServer": {
"type": "boolean",
"default": true,
"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."
},
"r.rmarkdown.codeLensCommands": {
"type": "array",
"items": {
Expand Down
44 changes: 33 additions & 11 deletions src/languageService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,17 @@ import { extensionContext } from './extension';
import { CommonOptions } from 'child_process';

export class LanguageService implements Disposable {
private client: LanguageClient | undefined;
private readonly clients: Map<string, LanguageClient> = new Map();
private readonly initSet: Set<string> = new Set();
private readonly config: WorkspaceConfiguration;
private readonly outputChannel: OutputChannel;

constructor() {
this.startLanguageService(this);
this.outputChannel = window.createOutputChannel('R Language Server');
this.client = undefined;
this.config = workspace.getConfiguration('r');
void this.startLanguageService(this);
}

dispose(): Thenable<void> {
Expand Down Expand Up @@ -154,6 +160,7 @@ export class LanguageService implements Disposable {
return client;
}


private checkClient(name: string): boolean {
if (this.initSet.has(name)) {
return true;
Expand All @@ -174,10 +181,7 @@ export class LanguageService implements Disposable {
}
}

private startLanguageService(self: LanguageService): void {
const config = workspace.getConfiguration('r');
const outputChannel: OutputChannel = window.createOutputChannel('R Language Server');

private startMultiLanguageService(self: LanguageService): void {
async function didOpenTextDocument(document: TextDocument) {
if (document.uri.scheme !== 'file' && document.uri.scheme !== 'untitled' && document.uri.scheme !== 'vscode-notebook-cell') {
return;
Expand All @@ -197,8 +201,8 @@ export class LanguageService implements Disposable {
const documentSelector: DocumentFilter[] = [
{ scheme: 'vscode-notebook-cell', language: 'r', pattern: `${document.uri.fsPath}` },
];
const client = await self.createClient(config, documentSelector,
dirname(document.uri.fsPath), folder, outputChannel);
const client = await self.createClient(self.config, documentSelector,
dirname(document.uri.fsPath), folder, self.outputChannel);
self.clients.set(key, client);
self.initSet.delete(key);
}
Expand All @@ -216,7 +220,7 @@ export class LanguageService implements Disposable {
{ scheme: 'file', language: 'r', pattern: pattern },
{ scheme: 'file', language: 'rmd', pattern: pattern },
];
const client = await self.createClient(config, documentSelector, folder.uri.fsPath, folder, outputChannel);
const client = await self.createClient(self.config, documentSelector, folder.uri.fsPath, folder, self.outputChannel);
self.clients.set(key, client);
self.initSet.delete(key);
}
Expand All @@ -232,7 +236,7 @@ export class LanguageService implements Disposable {
{ scheme: 'untitled', language: 'r' },
{ scheme: 'untitled', language: 'rmd' },
];
const client = await self.createClient(config, documentSelector, os.homedir(), undefined, outputChannel);
const client = await self.createClient(self.config, documentSelector, os.homedir(), undefined, self.outputChannel);
self.clients.set(key, client);
self.initSet.delete(key);
}
Expand All @@ -247,8 +251,8 @@ export class LanguageService implements Disposable {
const documentSelector: DocumentFilter[] = [
{ scheme: 'file', pattern: document.uri.fsPath },
];
const client = await self.createClient(config, documentSelector,
dirname(document.uri.fsPath), undefined, outputChannel);
const client = await self.createClient(self.config, documentSelector,
dirname(document.uri.fsPath), undefined, self.outputChannel);
self.clients.set(key, client);
self.initSet.delete(key);
}
Expand Down Expand Up @@ -301,8 +305,26 @@ export class LanguageService implements Disposable {
});
}

private async startLanguageService(self: LanguageService): Promise<void> {
if (self.config.get<boolean>('r.lsp.multiServer')) {
return this.startMultiLanguageService(self);
} else {
const documentSelector: DocumentFilter[] = [
{ language: 'r' },
{ language: 'rmd' },
];

const workspaceFolder = workspace.workspaceFolders?.[0];
const cwd = workspaceFolder ? workspaceFolder.uri.fsPath : os.homedir();
self.client = await self.createClient(self.config, documentSelector, cwd, workspaceFolder, self.outputChannel);
}
}

private stopLanguageService(): Thenable<void> {
const promises: Thenable<void>[] = [];
if (this.client) {
promises.push(this.client.stop());
}
for (const client of this.clients.values()) {
promises.push(client.stop());
}
Expand Down