Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more specific checks for being on TS 4.0.1 #104457

Merged
merged 1 commit into from
Aug 11, 2020
Merged

Add more specific checks for being on TS 4.0.1 #104457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions extensions/typescript-language-features/src/tsServer/spawner.ts
View file
Open in desktop
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
View file
Open in desktop
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