diff --git a/extensions/package.json b/extensions/package.json index 9c80cfc7731..af0de2f6181 100644 --- a/extensions/package.json +++ b/extensions/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "description": "Dependencies shared by all extensions", "dependencies": { - "typescript": "3.1.4" + "typescript": "3.2.0-rc" }, "scripts": { "postinstall": "node ./postinstall" diff --git a/extensions/typescript-language-features/src/features/rename.ts b/extensions/typescript-language-features/src/features/rename.ts index 8d0ceeeff77..a82bcb6ccee 100644 --- a/extensions/typescript-language-features/src/features/rename.ts +++ b/extensions/typescript-language-features/src/features/rename.ts @@ -11,14 +11,6 @@ import { ITypeScriptServiceClient, ServerResponse } from '../typescriptService'; import API from '../utils/api'; import * as typeConverters from '../utils/typeConverters'; -// TODO: Remove when we pick up TS 3.2 -declare module '../protocol' { - interface RenameTextSpan extends Proto.TextSpan { - readonly prefixText?: string; - readonly suffixText?: string; - } -} - const localize = nls.loadMessageBundle(); class TypeScriptRenameProvider implements vscode.RenameProvider { diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts index e08dfb140c4..b4d6e5a9c24 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts @@ -634,7 +634,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType this._tsServerLoading = undefined; } - const diagnosticEvent: Proto.DiagnosticEvent = event; + const diagnosticEvent = event as Proto.DiagnosticEvent; if (diagnosticEvent.body && diagnosticEvent.body.diagnostics) { this._onDiagnosticsReceived.fire({ kind: getDignosticsKind(event), diff --git a/extensions/yarn.lock b/extensions/yarn.lock index e2dfd06e5bb..7dfb337bfd6 100644 --- a/extensions/yarn.lock +++ b/extensions/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -typescript@3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.4.tgz#c74ef7b3c2da65beff548b903022cb8c3cd997ed" - integrity sha512-JZHJtA6ZL15+Q3Dqkbh8iCUmvxD3iJ7ujXS+fVkKnwIVAdHc5BJTDNM0aTrnr2luKulFjU7W+SRhDZvi66Ru7Q== +typescript@3.2.0-rc: + version "3.2.0-rc" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.0-rc.tgz#7c3816f1c761b096f4f1712382e872f4da8f263e" + integrity sha512-RgKDOpEdbU9dAkB4TzxWy46wiyNUKQo0NM0bB7WfvEFw50yu046ldQXpOUYMUTLIAHnToOCtHsu39MYE8o6NCw==