From 90de01176e7e7da970c0e367eb2b61936b2b5d41 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 26 Jun 2020 16:18:36 -0700 Subject: [PATCH] Always enable dynamic syntax server on TS 4.0+ We are looking for feedback on this new setting. For those on TS 4.0+, it should also be a sensible default --- .../src/tsServer/spawner.ts | 10 ++++++---- .../src/utils/configuration.ts | 4 ---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/extensions/typescript-language-features/src/tsServer/spawner.ts b/extensions/typescript-language-features/src/tsServer/spawner.ts index dcf0ed5a627..eefd944d70e 100644 --- a/extensions/typescript-language-features/src/tsServer/spawner.ts +++ b/extensions/typescript-language-features/src/tsServer/spawner.ts @@ -93,10 +93,12 @@ export class TypeScriptServerSpawner { return CompositeServerType.Single; case SeparateSyntaxServerConfiguration.Enabled: - return version.apiVersion?.gte(API.v340) ? CompositeServerType.SeparateSyntax : CompositeServerType.Single; - - case SeparateSyntaxServerConfiguration.Dynamic: - return version.apiVersion?.gte(API.v400) ? CompositeServerType.DynamicSeparateSyntax : CompositeServerType.Single; + if (version.apiVersion?.gte(API.v340)) { + return version.apiVersion?.gte(API.v400) + ? CompositeServerType.DynamicSeparateSyntax + : CompositeServerType.SeparateSyntax; + } + return CompositeServerType.Single; } } diff --git a/extensions/typescript-language-features/src/utils/configuration.ts b/extensions/typescript-language-features/src/utils/configuration.ts index 10290f3ad09..adeccbb8efc 100644 --- a/extensions/typescript-language-features/src/utils/configuration.ts +++ b/extensions/typescript-language-features/src/utils/configuration.ts @@ -49,7 +49,6 @@ export namespace TsServerLogLevel { export const enum SeparateSyntaxServerConfiguration { Disabled, Enabled, - Dynamic, } export class TypeScriptServiceConfiguration { @@ -168,9 +167,6 @@ export class TypeScriptServiceConfiguration { if (value === true) { return SeparateSyntaxServerConfiguration.Enabled; } - if (value === 'dynamic') { - return SeparateSyntaxServerConfiguration.Dynamic; - } return SeparateSyntaxServerConfiguration.Disabled; }