Skip to content

Commit 51e2299

Browse files
author
VSCode
committed
Merge remote-tracking branch 'origin/master' into HEAD
2 parents fd39392 + 4193455 commit 51e2299

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"minimist": "^1.2.3",
4646
"request": "^2.85.0",
4747
"terser": "4.3.8",
48-
"typescript": "^4.0.0-dev.20200729",
48+
"typescript": "^4.0.0-dev.20200803",
4949
"vsce": "1.48.0",
5050
"vscode-telemetry-extractor": "^1.6.0",
5151
"xml2js": "^0.4.17"

build/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2535,10 +2535,10 @@ typescript@^3.0.1:
25352535
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
25362536
integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
25372537

2538-
typescript@^4.0.0-dev.20200729:
2539-
version "4.0.0-dev.20200729"
2540-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200729.tgz#3e335af3ed54513bbfd9485799837b95bdfd15a0"
2541-
integrity sha512-jzPalday93NlFVuRkY7Vixd7I9dLKoefoB2dvIhoqWaAGc5WPbOQmCHOilEGPSXNd9gb+uy97RH6+EwM/cf1gQ==
2538+
typescript@^4.0.0-dev.20200803:
2539+
version "4.0.0-dev.20200803"
2540+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200803.tgz#ea8b0e9fb2ee3085598ff200c8568f04f4cbb2ba"
2541+
integrity sha512-f/jDkFqCs0gbUd5MCUijO9u3AOMx1x1HdRDDHSidlc6uPVEkRduxjeTFhIXbGutO7ivzv+aC2sxH+1FQwsyBcg==
25422542

25432543
typical@^4.0.0:
25442544
version "4.0.0"

extensions/typescript-language-features/src/languageFeatures/completions.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
561561
"type" : { "classification": "SystemMetadata", "purpose": "FeatureInsight" },
562562
"count" : { "classification": "SystemMetadata", "purpose": "FeatureInsight" },
563563
"updateGraphDurationMs" : { "classification": "SystemMetadata", "purpose": "FeatureInsight" },
564+
"createAutoImportProviderProgramDurationMs" : { "classification": "SystemMetadata", "purpose": "FeatureInsight" },
564565
"includesPackageJsonImport" : { "classification": "SystemMetadata", "purpose": "FeatureInsight" },
565566
"${include}": [
566567
"${TypeScriptCommonProperties}"
@@ -572,6 +573,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
572573
type: response?.type ?? 'unknown',
573574
count: response?.type === 'response' && response.body ? response.body.entries.length : 0,
574575
updateGraphDurationMs: response?.type === 'response' ? response.performanceData?.updateGraphDurationMs : undefined,
576+
createAutoImportProviderProgramDurationMs: response?.type === 'response' ? (response.performanceData as Proto.PerformanceData & { createAutoImportProviderProgramDurationMs?: number })?.createAutoImportProviderProgramDurationMs : undefined,
575577
includesPackageJsonImport: includesPackageJsonImport ? 'true' : undefined,
576578
});
577579
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
"source-map": "^0.4.4",
165165
"style-loader": "^1.0.0",
166166
"ts-loader": "^4.4.2",
167-
"typescript": "^4.0.0-dev.20200729",
167+
"typescript": "^4.0.0-dev.20200803",
168168
"typescript-formatter": "7.1.0",
169169
"underscore": "^1.8.2",
170170
"vinyl": "^2.0.0",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9369,10 +9369,10 @@ typescript@^2.6.2:
93699369
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
93709370
integrity sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=
93719371

9372-
typescript@^4.0.0-dev.20200729:
9373-
version "4.0.0-dev.20200729"
9374-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200729.tgz#3e335af3ed54513bbfd9485799837b95bdfd15a0"
9375-
integrity sha512-jzPalday93NlFVuRkY7Vixd7I9dLKoefoB2dvIhoqWaAGc5WPbOQmCHOilEGPSXNd9gb+uy97RH6+EwM/cf1gQ==
9372+
typescript@^4.0.0-dev.20200803:
9373+
version "4.0.0-dev.20200803"
9374+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200803.tgz#ea8b0e9fb2ee3085598ff200c8568f04f4cbb2ba"
9375+
integrity sha512-f/jDkFqCs0gbUd5MCUijO9u3AOMx1x1HdRDDHSidlc6uPVEkRduxjeTFhIXbGutO7ivzv+aC2sxH+1FQwsyBcg==
93769376

93779377
uc.micro@^1.0.1, uc.micro@^1.0.3:
93789378
version "1.0.3"

0 commit comments

Comments
 (0)