From 1f567e10f37a4536ae03ab08ad8dfd35c1f27333 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 26 Feb 2021 17:38:37 -0800 Subject: [PATCH] Fixing two more cases for promises in conditionals --- .../html-language-features/server/src/modes/javascriptMode.ts | 4 +--- .../typescript-language-features/src/tsServer/server.ts | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts index bb630594852..a17cd4c839b 100644 --- a/extensions/html-language-features/server/src/modes/javascriptMode.ts +++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts @@ -65,9 +65,7 @@ function getLanguageServiceHost(scriptKind: ts.ScriptKind) { return compilerOptions; }, dispose() { - if (jsLanguageService) { - jsLanguageService.then(s => s.dispose()); - } + jsLanguageService.then(s => s.dispose()); } }; } diff --git a/extensions/typescript-language-features/src/tsServer/server.ts b/extensions/typescript-language-features/src/tsServer/server.ts index d6294f2512d..9d2c8551266 100644 --- a/extensions/typescript-language-features/src/tsServer/server.ts +++ b/extensions/typescript-language-features/src/tsServer/server.ts @@ -355,7 +355,7 @@ class RequestRouter { for (let serverIndex = 0; serverIndex < this.servers.length; ++serverIndex) { const server = this.servers[serverIndex].server; - const request = server.executeImpl(command, args, { ...executeInfo, token }); + const request = server.executeImpl(command, args, { ...executeInfo, token }) as Promise> | undefined; if (serverIndex === 0) { firstRequest = request; }