Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Bierner <matb@microsoft.com>2020-08-12 01:43:16 +0300
committerGitHub <noreply@github.com>2020-08-12 01:43:16 +0300
commitdb40434f562994116e5b21c24015a2e40b2504e6 (patch)
tree6d63151855c3b9b7bc1a4ee6929f0b58602075d8
parent4c23fc22ced6d0c1f58215ce91ccd08d0c8a0006 (diff)
Add more specific checks for being on TS 4.0.1 (#104457)1.48.0
Fixes #104456
-rw-r--r--extensions/typescript-language-features/src/tsServer/spawner.ts9
-rw-r--r--extensions/typescript-language-features/src/utils/api.ts2
2 files changed, 4 insertions, 7 deletions
diff --git a/extensions/typescript-language-features/src/tsServer/spawner.ts b/extensions/typescript-language-features/src/tsServer/spawner.ts
index 092ad4f0fb6..70f1b41574e 100644
--- a/extensions/typescript-language-features/src/tsServer/spawner.ts
+++ b/extensions/typescript-language-features/src/tsServer/spawner.ts
@@ -18,7 +18,6 @@ import { ILogDirectoryProvider } from './logDirectoryProvider';
import { GetErrRoutingTsServer, ITypeScriptServer, ProcessBasedTsServer, SyntaxRoutingTsServer, TsServerDelegate, TsServerProcessFactory, TsServerProcessKind } from './server';
import { TypeScriptVersionManager } from './versionManager';
import { ITypeScriptVersionProvider, TypeScriptVersion } from './versionProvider';
-import * as semver from 'semver';
const enum CompositeServerType {
/** Run a single server that handles all commands */
@@ -164,11 +163,9 @@ export class TypeScriptServerSpawner {
let tsServerLogFile: string | undefined;
if (kind === TsServerProcessKind.Syntax) {
- if (semver.gte(API.v400rc.fullVersionString, apiVersion.fullVersionString)) {
- args.push('--serverMode');
- args.push('partialSemantic');
- }
- else {
+ if (apiVersion.gte(API.v401)) {
+ args.push('--serverMode', 'partialSemantic');
+ } else {
args.push('--syntaxOnly');
}
}
diff --git a/extensions/typescript-language-features/src/utils/api.ts b/extensions/typescript-language-features/src/utils/api.ts
index f797e578121..289c091f5b1 100644
--- a/extensions/typescript-language-features/src/utils/api.ts
+++ b/extensions/typescript-language-features/src/utils/api.ts
@@ -34,8 +34,8 @@ export default class API {
public static readonly v380 = API.fromSimpleString('3.8.0');
public static readonly v381 = API.fromSimpleString('3.8.1');
public static readonly v390 = API.fromSimpleString('3.9.0');
- public static readonly v400rc = API.fromSimpleString('4.0.0-rc');
public static readonly v400 = API.fromSimpleString('4.0.0');
+ public static readonly v401 = API.fromSimpleString('4.0.1');
public static fromVersionString(versionString: string): API {
let version = semver.valid(versionString);