maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only run specific commands on the syntax server

Browse source 
This works better than running all commands on the syntax server by default
This commit is contained in:
Matt Bierner 2020-06-11 20:05:25 -07:00
parent 51d697c202
commit 7e4cc2c435
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
extensions/typescript-language-features/src/tsServer/server.ts
View file

@ -380,7 +380,7 @@ class RequestRouter {
}
const syntaxCommands: ReadonlySet<keyof TypeScriptRequests> = new Set<keyof TypeScriptRequests>([
const syntaxAlwaysCommands: ReadonlySet<keyof TypeScriptRequests> = new Set<keyof TypeScriptRequests>([
'navtree',
'getOutliningSpans',
'jsxClosingTag',
@ -407,7 +407,7 @@ export class SyntaxRoutingTsServer extends Disposable implements ITypeScriptServ
this.router = new RequestRouter(
[
{ server: this.syntaxServer, canRun: (command) => syntaxCommands.has(command) },
{ server: this.syntaxServer, canRun: (command) => syntaxAlwaysCommands.has(command) },
{ server: this.semanticServer, canRun: undefined /* gets all other commands */ }
],
delegate);
@ -527,12 +527,33 @@ export class GetErrRoutingTsServer extends Disposable implements ITypeScriptServ
export class ProjectLoadingRoutingSyntaxTsServer extends Disposable implements ITypeScriptServer {
/**
* Commands that should always be run on the semantic server.
*/
private static readonly semanticCommands = new Set<keyof TypeScriptRequests>([
'geterr',
'geterrForProject',
'projectInfo'
]);
/**
* Commands that can be run on the syntax server but would benefit from being upgraded to the semantic server.
*/
private syntaxAllowedCommands = new Set<keyof TypeScriptRequests>([
'completions',
'completionEntryDetails',
'completionInfo',
'definition',
'definitionAndBoundSpan',
'documentHighlights',
'implementation',
'navto',
'quickinfo',
'references',
'rename',
'signatureHelp',
]);
private readonly syntaxServer: ITypeScriptServer;
private readonly semanticServer: ITypeScriptServer;
private readonly router: RequestRouter;
@ -553,13 +574,13 @@ export class ProjectLoadingRoutingSyntaxTsServer extends Disposable implements I
{
server: this.syntaxServer,
canRun: (command) => {
if (syntaxCommands.has(command)) {
if (syntaxAlwaysCommands.has(command)) {
return true;
}
if (ProjectLoadingRoutingSyntaxTsServer.semanticCommands.has(command)) {
return false;
}
if (this._projectLoading) {
if (this.projectLoading && this.syntaxAllowedCommands.has(command)) {
return true;
}
return false;
@ -600,6 +621,8 @@ export class ProjectLoadingRoutingSyntaxTsServer extends Disposable implements I
this._register(this.semanticServer.onError(e => this._onError.fire(e)));
}
private get projectLoading() { return this._projectLoading; }
private readonly _onEvent = this._register(new vscode.EventEmitter<Proto.Event>());
public readonly onEvent = this._onEvent.event;