development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatically restart TS server when user changes TS versions. Fixes #25431

Browse source
This commit is contained in:
Matt Bierner 2017-04-26 22:14:28 -07:00
parent 31fdab9da8
commit 456d58d9c9
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
extensions/typescript/src/typescriptServiceClient.ts
View file

@ -226,7 +226,7 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
if (this.servicePromise === null && (oldglobalTsdk !== this.globalTsdk || oldLocalTsdk !== this.localTsdk)) {
this.startService();
} else if (this.servicePromise !== null && (this.tsServerLogLevel !== oldLoggingLevel || (oldglobalTsdk !== this.globalTsdk || oldLocalTsdk !== this.localTsdk))) {
this.promptUserToRestartTsServer();
this.restartTsServer();
}
}));
if (this.packageInfo && this.packageInfo.aiKey) {
@ -255,21 +255,6 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
}
}
private promptUserToRestartTsServer(): void {
const restartItem = { title: localize('restartTsServerTitle', 'Restart') };
window.showInformationMessage<MessageItem>(
localize('restartTypeScriptServerBlurb', 'Restart TypeScript Server to apply change'),
restartItem,
{
title: localize('later', 'Later'),
isCloseAffordance: true
})
.then(selected => {
if (selected === restartItem) {
this.restartTsServer();
}
});
}
private extractGlobalTsdk(configuration: WorkspaceConfiguration): string | null {
let inspect = configuration.inspect('typescript.tsdk');
@ -673,7 +658,7 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
if (firstRun || newModulePath === this.modulePath) {
return;
}
this.promptUserToRestartTsServer();
this.restartTsServer();
};
return window.showQuickPick<MyQuickPickItem>(pickOptions, {
@ -854,6 +839,7 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
private serviceExited(restart: boolean): void {
this.servicePromise = null;
this.tsServerLogFile = null;
Object.keys(this.callbacks).forEach((key) => {
this.callbacks[parseInt(key)].e(new Error('Service died.'));
});