Skip to content

Commit f6d1bd8

Browse files
committed
Fix issue with deactivation when not real-activated
1 parent 80161f1 commit f6d1bd8

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

Extension/src/LanguageServer/extension.ts

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,21 +1291,23 @@ function handleMacCrashFileRead(err: NodeJS.ErrnoException | undefined | null, d
12911291
}
12921292

12931293
export function deactivate(): Thenable<void> {
1294-
clients.timeTelemetryCollector.clear();
1295-
console.log("deactivating extension");
1296-
telemetry.logLanguageServerEvent("LanguageServerShutdown");
1297-
clearInterval(intervalTimer);
1298-
clearInterval(insiderUpdateTimer);
1299-
disposables.forEach(d => d.dispose());
1300-
languageConfigurations.forEach(d => d.dispose());
1301-
ui.dispose();
1302-
if (taskProvider) {
1303-
taskProvider.dispose();
1304-
}
1305-
if (codeActionProvider) {
1306-
codeActionProvider.dispose();
1294+
if (realActivationOccurred) {
1295+
clients.timeTelemetryCollector.clear();
1296+
console.log("deactivating extension");
1297+
telemetry.logLanguageServerEvent("LanguageServerShutdown");
1298+
clearInterval(intervalTimer);
1299+
clearInterval(insiderUpdateTimer);
1300+
disposables.forEach(d => d.dispose());
1301+
languageConfigurations.forEach(d => d.dispose());
1302+
ui.dispose();
1303+
if (taskProvider) {
1304+
taskProvider.dispose();
1305+
}
1306+
if (codeActionProvider) {
1307+
codeActionProvider.dispose();
1308+
}
1309+
return clients.dispose();
13071310
}
1308-
return clients.dispose();
13091311
}
13101312

13111313
export function isFolderOpen(): boolean {

0 commit comments

Comments
 (0)