diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript/src/typescriptServiceClient.ts index 2ba8c225c25f5897fbcef838cbf153daed7381c7..a35280458520b87d50f0951e3cff882481db1235 100644 --- a/extensions/typescript/src/typescriptServiceClient.ts +++ b/extensions/typescript/src/typescriptServiceClient.ts @@ -365,9 +365,9 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient if (this.apiVersion.has230Features()) { if (this.plugins.length) { args.push('--globalPlugins', this.plugins.map(x => x.name).join(',')); - // if (currentVersion.path === this.versionProvider.defaultVersion.path) { - args.push('--pluginProbeLocations', this.plugins.map(x => x.path).join(',')); - // } + if (currentVersion.path === this.versionProvider.defaultVersion.path) { + args.push('--pluginProbeLocations', this.plugins.map(x => x.path).join(',')); + } } } diff --git a/extensions/typescript/src/utils/api.ts b/extensions/typescript/src/utils/api.ts index 69307cad289956a0b623bd804a13b6f97f44bdf2..51a630b83a0f1313d86f9ff9e616256a57d91c20 100644 --- a/extensions/typescript/src/utils/api.ts +++ b/extensions/typescript/src/utils/api.ts @@ -16,7 +16,7 @@ export default class API { return new API(localize('invalidVersion', 'invalid version'), '1.0.0'); } - // Cut of any prerelease tag since we sometimes consume those on purpose. + // Cut off any prerelease tag since we sometimes consume those on purpose. const index = versionString.indexOf('-'); if (index >= 0) { version = version.substr(0, index); @@ -29,7 +29,6 @@ export default class API { private readonly version: string ) { } - public has203Features(): boolean { return semver.gte(this.version, '2.0.3'); } diff --git a/extensions/typescript/src/utils/async.ts b/extensions/typescript/src/utils/async.ts index f87754e69e89a4d50f58908f97c1cf8267f90cef..db4ca99ed8f02cc4b0533e54a2287c09d293f5a2 100644 --- a/extensions/typescript/src/utils/async.ts +++ b/extensions/typescript/src/utils/async.ts @@ -53,27 +53,6 @@ export class Delayer { return this.completionPromise; } - public forceDelivery(): Promise | null { - if (!this.completionPromise) { - return null; - } - this.cancelTimeout(); - let result = this.completionPromise; - if (this.onSuccess) { - this.onSuccess(undefined); - } - return result; - } - - public isTriggered(): boolean { - return this.timeout !== null; - } - - public cancel(): void { - this.cancelTimeout(); - this.completionPromise = null; - } - private cancelTimeout(): void { if (this.timeout !== null) { clearTimeout(this.timeout);