Skip to content

Commit 65c6a0a

Browse files
committed
Pick up TS 4.3 nightly
For microsoft#122884
1 parent 6c10fb4 commit 65c6a0a

File tree

5 files changed

+5
-14
lines changed

5 files changed

+5
-14
lines changed

extensions/html-language-features/server/src/modes/javascriptMode.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
127127
async doResolve(document: TextDocument, item: CompletionItem): Promise<CompletionItem> {
128128
const jsDocument = jsDocuments.get(document);
129129
const jsLanguageService = await host.getLanguageService(jsDocument);
130-
// @ts-expect-error until 4.3 protocol update
131130
let details = jsLanguageService.getCompletionEntryDetails(jsDocument.uri, item.data.offset, item.label, undefined, undefined, undefined, undefined);
132131
if (details) {
133132
item.detail = ts.displayPartsToString(details.displayParts);

extensions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"description": "Dependencies shared by all extensions",
66
"dependencies": {
7-
"typescript": "4.2.4"
7+
"typescript": "^4.3.0-dev.20210503"
88
},
99
"scripts": {
1010
"postinstall": "node ./postinstall"

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ class MyCompletionItem extends vscode.CompletionItem {
7979
this.sortText = tsEntry.sortText;
8080
}
8181

82-
// @ts-expect-error until 4.3 protocol update
8382
const { sourceDisplay, isSnippet } = tsEntry;
8483
if (sourceDisplay) {
8584
this.label2 = { name: tsEntry.name, qualifier: Previewer.plainWithLinks(sourceDisplay, client) };
@@ -184,11 +183,9 @@ class MyCompletionItem extends vscode.CompletionItem {
184183
const args: Proto.CompletionDetailsRequestArgs = {
185184
...typeConverters.Position.toFileLocationRequestArgs(filepath, this.position),
186185
entryNames: [
187-
// @ts-expect-error until TypeScript 4.3 protocol update
188186
this.tsEntry.source || this.tsEntry.data ? {
189187
name: this.tsEntry.name,
190188
source: this.tsEntry.source,
191-
// @ts-expect-error until TypeScript 4.3 protocol update
192189
data: this.tsEntry.data,
193190
} : this.tsEntry.name
194191
]
@@ -561,7 +558,6 @@ class CompletionAcceptedCommand implements Command {
561558
*/
562559
this.telemetryReporter.logTelemetry('completions.accept', {
563560
isPackageJsonImport: item.tsEntry.isPackageJsonImport ? 'true' : undefined,
564-
// @ts-expect-error until 4.3 protocol update
565561
isImportStatementCompletion: item.tsEntry.isImportStatementCompletion ? 'true' : undefined,
566562
});
567563
}
@@ -753,7 +749,6 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
753749
dotAccessorContext = { range, text };
754750
}
755751
}
756-
// @ts-expect-error until 4.3 protocol update
757752
isIncomplete = !!response.body.isIncomplete || (response as any).metadata && (response as any).metadata.isIncomplete;
758753
entries = response.body.entries;
759754
metadata = response.metadata;
@@ -792,7 +787,6 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
792787
};
793788
items.push(item);
794789
includesPackageJsonImport = includesPackageJsonImport || !!entry.isPackageJsonImport;
795-
// @ts-expect-error until 4.3 protocol update
796790
includesImportStatementCompletion = includesImportStatementCompletion || !!entry.isImportStatementCompletion;
797791
}
798792
}
@@ -842,7 +836,6 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
842836
return this.client.apiVersion.lt(API.v381) ? undefined : '#';
843837

844838
case ' ':
845-
// @ts-expect-error until 4.3.0 protocol update
846839
const space: Proto.CompletionsTriggerCharacter = ' ';
847840
return this.client.apiVersion.gte(API.v430) ? space : undefined;
848841

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ export default class FileConfigurationManager extends Disposable {
183183
includeAutomaticOptionalChainCompletions: config.get<boolean>('suggest.includeAutomaticOptionalChainCompletions', true),
184184
provideRefactorNotApplicableReason: true,
185185
generateReturnInDocTemplate: config.get<boolean>('suggest.jsdoc.generateReturns', true),
186-
// @ts-expect-error until 4.3 protocol update
187186
includeCompletionsForImportStatements: config.get<boolean>('suggest.includeCompletionsForImportStatements', true),
188187
includeCompletionsWithSnippetText: config.get<boolean>('suggest.includeCompletionsWithSnippetText', true),
189188
displayPartsForJSDoc: true,

extensions/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ fast-plist@0.1.2:
2424
resolved "https://registry.yarnpkg.com/fast-plist/-/fast-plist-0.1.2.tgz#a45aff345196006d406ca6cdcd05f69051ef35b8"
2525
integrity sha1-pFr/NFGWAG1AbKbNzQX2kFHvNbg=
2626

27-
typescript@4.2.4:
28-
version "4.2.4"
29-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
30-
integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
27+
typescript@^4.3.0-dev.20210503:
28+
version "4.3.0-dev.20210503"
29+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210503.tgz#0a3eb480676effd4975beb5a2f097530ed53550a"
30+
integrity sha512-Gj3TQve5PLCZoPBy96Yp6Y3+jNLmms0i3ynhxEJAKgax7Fxui29/uG/DClbBtKz1peNhzXwikXVFFAV1BB/3mw==
3131

3232
vscode-grammar-updater@^1.0.3:
3333
version "1.0.3"

0 commit comments

Comments
 (0)