Always enable dynamic syntax server on TS 4.0+

mjbvz · mjbvz · commit 90de01176e7e · 2020-06-26T16:18:48.000-07:00
We are looking for feedback on this new setting. For those on TS 4.0+, it should also be a sensible default
diff --git 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
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ export namespace TsServerLogLevel {`
`49`	`49`	`export const enum SeparateSyntaxServerConfiguration {`
`50`	`50`	`Disabled,`
`51`	`51`	`Enabled,`
`52`		`- Dynamic,`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`export class TypeScriptServiceConfiguration {`
`@@ -168,9 +167,6 @@ export class TypeScriptServiceConfiguration {`
`168`	`167`	`if (value === true) {`
`169`	`168`	`return SeparateSyntaxServerConfiguration.Enabled;`
`170`	`169`	`}`
`171`		`- if (value === 'dynamic') {`
`172`		`- return SeparateSyntaxServerConfiguration.Dynamic;`
`173`		`- }`
`174`	`170`	`return SeparateSyntaxServerConfiguration.Disabled;`
`175`	`171`	`}`
`176`	`172`