From 813c0b2178d091ac209e7e684261182ddafea856 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 6 Aug 2021 15:46:38 -0700 Subject: [PATCH] Pick up newest TS versions --- build/package.json | 2 +- build/yarn.lock | 8 ++++---- extensions/package.json | 2 +- .../src/languageFeatures/codeLens/baseCodeLensProvider.ts | 1 - .../src/utils/typeConverters.ts | 1 - extensions/yarn.lock | 8 ++++---- package.json | 2 +- yarn.lock | 8 ++++---- 8 files changed, 15 insertions(+), 17 deletions(-) diff --git a/build/package.json b/build/package.json index 88e6420ac56..6f004f0cec8 100644 --- a/build/package.json +++ b/build/package.json @@ -61,7 +61,7 @@ "plist": "^3.0.1", "source-map": "0.6.1", "tmp": "^0.2.1", - "typescript": "^4.4.0-dev.20210802", + "typescript": "^4.4.0-dev.20210806", "vsce": "1.48.0", "vscode-universal-bundler": "^0.0.2" }, diff --git a/build/yarn.lock b/build/yarn.lock index a2598c99aa5..71ffdc9e259 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -2348,10 +2348,10 @@ typed-rest-client@^0.9.0: tunnel "0.0.4" underscore "1.8.3" -typescript@^4.4.0-dev.20210802: - version "4.4.0-dev.20210802" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.0-dev.20210802.tgz#6bb697544506b33c062ae2e18413bef23251ba72" - integrity sha512-PknU1j5Vk6LCUWgUwqAcTpuYv1WfvNEaMDTS5mbFFcXTTek9/z9PQgJPl3gyYGeQXjjcbhYe3JVHXG3jOExAuQ== +typescript@^4.4.0-dev.20210806: + version "4.4.0-dev.20210806" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.0-dev.20210806.tgz#8b99a48596f0f4dd17980ddc19f81e25b56fd4df" + integrity sha512-Bg5FkLhMwHSM59QIOeFjYPL0LCxfY8eVFgubpmIHHilZFzjUvlmXDx77DePFL0uQJ40xlzea/5UOOfljCvupUw== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.5" diff --git a/extensions/package.json b/extensions/package.json index 9b63fad61d0..ea888685f89 100644 --- a/extensions/package.json +++ b/extensions/package.json @@ -4,7 +4,7 @@ "license": "MIT", "description": "Dependencies shared by all extensions", "dependencies": { - "typescript": "^4.4.0-dev.20210728" + "typescript": "^4.4.0-dev.20210806" }, "scripts": { "postinstall": "node ./postinstall" diff --git a/extensions/typescript-language-features/src/languageFeatures/codeLens/baseCodeLensProvider.ts b/extensions/typescript-language-features/src/languageFeatures/codeLens/baseCodeLensProvider.ts index b774423ed82..1e7293eb93d 100644 --- a/extensions/typescript-language-features/src/languageFeatures/codeLens/baseCodeLensProvider.ts +++ b/extensions/typescript-language-features/src/languageFeatures/codeLens/baseCodeLensProvider.ts @@ -95,7 +95,6 @@ export function getSymbolRange( document: vscode.TextDocument, item: Proto.NavigationTree ): vscode.Range | null { - // TS 3.0+ provides a span for just the symbol if (item.nameSpan) { return typeConverters.Range.fromTextSpan(item.nameSpan); } diff --git a/extensions/typescript-language-features/src/utils/typeConverters.ts b/extensions/typescript-language-features/src/utils/typeConverters.ts index 6bc62700d60..1e81c133262 100644 --- a/extensions/typescript-language-features/src/utils/typeConverters.ts +++ b/extensions/typescript-language-features/src/utils/typeConverters.ts @@ -128,7 +128,6 @@ export namespace SymbolKind { } export namespace CompletionTriggerKind { - // TODO: once 4.4 protocol is available, replace number literals in return statements. export function toProtocolCompletionTriggerKind(kind: vscode.CompletionTriggerKind): Proto.CompletionTriggerKind { switch (kind) { case vscode.CompletionTriggerKind.Invoke: return 1; diff --git a/extensions/yarn.lock b/extensions/yarn.lock index f2e20b5abf4..75d1f638718 100644 --- a/extensions/yarn.lock +++ b/extensions/yarn.lock @@ -24,10 +24,10 @@ fast-plist@0.1.2: resolved "https://registry.yarnpkg.com/fast-plist/-/fast-plist-0.1.2.tgz#a45aff345196006d406ca6cdcd05f69051ef35b8" integrity sha1-pFr/NFGWAG1AbKbNzQX2kFHvNbg= -typescript@^4.4.0-dev.20210728: - version "4.4.0-dev.20210728" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.0-dev.20210728.tgz#93595435d2f64d9da44e1d0fc0e8184132006023" - integrity sha512-ZAbNY9MCH4O4gtolh/3+nsYgDxItqCGBIqERwaKLzjMDJDyvyiZZzcUHsU6DMo/44dAetm4LXZ26bf8hbryUew== +typescript@^4.4.0-dev.20210806: + version "4.4.0-dev.20210806" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.0-dev.20210806.tgz#8b99a48596f0f4dd17980ddc19f81e25b56fd4df" + integrity sha512-Bg5FkLhMwHSM59QIOeFjYPL0LCxfY8eVFgubpmIHHilZFzjUvlmXDx77DePFL0uQJ40xlzea/5UOOfljCvupUw== vscode-grammar-updater@^1.0.3: version "1.0.3" diff --git a/package.json b/package.json index 982d8cff55f..fdfa3300193 100644 --- a/package.json +++ b/package.json @@ -196,7 +196,7 @@ "style-loader": "^1.0.0", "ts-loader": "^9.2.3", "tsec": "0.1.4", - "typescript": "^4.4.0-dev.20210802", + "typescript": "^4.4.0-dev.20210806", "typescript-formatter": "7.1.0", "underscore": "^1.12.1", "util": "^0.12.4", diff --git a/yarn.lock b/yarn.lock index 1e539cabd7e..3d6b21a5f03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10224,10 +10224,10 @@ typescript@^2.6.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" integrity sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q= -typescript@^4.4.0-dev.20210802: - version "4.4.0-dev.20210802" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.0-dev.20210802.tgz#6bb697544506b33c062ae2e18413bef23251ba72" - integrity sha512-PknU1j5Vk6LCUWgUwqAcTpuYv1WfvNEaMDTS5mbFFcXTTek9/z9PQgJPl3gyYGeQXjjcbhYe3JVHXG3jOExAuQ== +typescript@^4.4.0-dev.20210806: + version "4.4.0-dev.20210806" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.0-dev.20210806.tgz#8b99a48596f0f4dd17980ddc19f81e25b56fd4df" + integrity sha512-Bg5FkLhMwHSM59QIOeFjYPL0LCxfY8eVFgubpmIHHilZFzjUvlmXDx77DePFL0uQJ40xlzea/5UOOfljCvupUw== typical@^4.0.0: version "4.0.0"