Merge pull request #8388 from microsoft/coleng/fix_deactivate_race

Colengms · web-flow · commit 081bf843d564 · 2021-11-11T15:08:13.000-08:00
diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts
@@ -1291,6 +1291,9 @@ function handleMacCrashFileRead(err: NodeJS.ErrnoException | undefined | null, d
 }
 
 export function deactivate(): Thenable<void> {
+    if (!realActivationOccurred) {
+        return Promise.resolve();
+    }
     clients.timeTelemetryCollector.clear();
     console.log("deactivating extension");
     telemetry.logLanguageServerEvent("LanguageServerShutdown");

Original file line number	Diff line number	Diff line change
`@@ -1291,6 +1291,9 @@ function handleMacCrashFileRead(err: NodeJS.ErrnoException \| undefined \| null, d`
`1291`	`1291`	`}`
`1292`	`1292`
`1293`	`1293`	`export function deactivate(): Thenable<void> {`
	`1294`	`+ if (!realActivationOccurred) {`
	`1295`	`+ return Promise.resolve();`
	`1296`	`+ }`
`1294`	`1297`	`clients.timeTelemetryCollector.clear();`
`1295`	`1298`	`console.log("deactivating extension");`
`1296`	`1299`	`telemetry.logLanguageServerEvent("LanguageServerShutdown");`