Skip to content

Commit

Permalink
Add more specific checks for being on TS 4.0.1 (#104457)
Browse files Browse the repository at this point in the history
Fixes #104456
  • Loading branch information
mjbvz authored Aug 11, 2020
1 parent 4c23fc2 commit db40434
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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');
}
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/typescript-language-features/src/utils/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit db40434

Please sign in to comment.