Skip to content

Commit 33e16e8

Browse files
committed
Fix test failure
1 parent f6d1bd8 commit 33e16e8

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

Extension/src/LanguageServer/extension.ts

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

12931293
export function deactivate(): Thenable<void> {
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();
1294+
if (!realActivationOccurred) {
1295+
return Promise.resolve();
1296+
}
1297+
clients.timeTelemetryCollector.clear();
1298+
console.log("deactivating extension");
1299+
telemetry.logLanguageServerEvent("LanguageServerShutdown");
1300+
clearInterval(intervalTimer);
1301+
clearInterval(insiderUpdateTimer);
1302+
disposables.forEach(d => d.dispose());
1303+
languageConfigurations.forEach(d => d.dispose());
1304+
ui.dispose();
1305+
if (taskProvider) {
1306+
taskProvider.dispose();
1307+
}
1308+
if (codeActionProvider) {
1309+
codeActionProvider.dispose();
13101310
}
1311+
return clients.dispose();
13111312
}
13121313

13131314
export function isFolderOpen(): boolean {

0 commit comments

Comments
 (0)