Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 10:38:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove ts-expect-error

Browse Source
This commit is contained in:
Matt Bierner
2024-09-11 14:49:06 -07:00
parent 5df28bfd6a
commit 94d5b2a31e
7 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/typescript-language-features/src/extension.browser.ts
View File

@@ -61,7 +61,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<Api> {
new TypeScriptVersion(
TypeScriptVersionSource.Bundled,
vscode.Uri.joinPath(context.extensionUri, 'dist/browser/typescript/tsserver.web.js').toString(),
API.fromSimpleString('5.5.4')));
API.fromSimpleString('5.6.2')));
let experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined;
const packageInfo = getPackageInfo(context);

6
extensions/typescript-language-features/src/languageFeatures/completions.ts
View File

@@ -506,8 +506,7 @@ class MyCompletionItem extends vscode.CompletionItem {
entry: Proto.CompletionEntry,
defaultCommitCharacters: readonly string[] | undefined,
): string[] | undefined {
// @ts-expect-error until TS 5.6
let commitCharacters = (entry.commitCharacters as string[] | undefined) ?? (defaultCommitCharacters ? Array.from(defaultCommitCharacters) : undefined);
let commitCharacters = entry.commitCharacters ?? (defaultCommitCharacters ? Array.from(defaultCommitCharacters) : undefined);
if (commitCharacters) {
if (context.enableCallCompletions
&& !context.isNewIdentifierLocation
@@ -781,8 +780,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
const isIncomplete = !!response.body.isIncomplete || (response.metadata as any)?.isIncomplete;
const entries = response.body.entries;
const metadata = response.metadata;
// @ts-expect-error until TS 5.6
const defaultCommitCharacters: readonly string[] | undefined = Object.freeze(response.body.defaultCommitCharacters);
const defaultCommitCharacters = Object.freeze(response.body.defaultCommitCharacters);
if (response.body.optionalReplacementSpan) {
optionalReplacementRange = typeConverters.Range.fromTextSpan(response.body.optionalReplacementSpan);

13
extensions/typescript-language-features/src/languageFeatures/diagnostics.ts
View File

@@ -4,15 +4,14 @@
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode';
import { TypeScriptServiceConfiguration } from '../configuration/configuration';
import { DiagnosticLanguage } from '../configuration/languageDescription';
import { TelemetryReporter } from '../logging/telemetry';
import { DiagnosticPerformanceData as TsDiagnosticPerformanceData } from '../tsServer/protocol/protocol';
import * as arrays from '../utils/arrays';
import { Disposable } from '../utils/dispose';
import { ResourceMap } from '../utils/resourceMap';
import { TelemetryReporter } from '../logging/telemetry';
import { TypeScriptServiceConfiguration } from '../configuration/configuration';
import { equals } from '../utils/objects';
// @ts-expect-error until ts 5.6
import { DiagnosticPerformanceData as TsDiagnosticPerformanceData } from '../tsServer/protocol/protocol';
import { ResourceMap } from '../utils/resourceMap';
function diagnosticsEquals(a: vscode.Diagnostic, b: vscode.Diagnostic): boolean {
if (a === b) {
@@ -217,13 +216,9 @@ class DiagnosticsTelemetryManager extends Disposable {
*/
this._telemetryReporter.logTelemetry('diagnostics.performance',
{
// @ts-expect-error until ts 5.6
syntaxDiagDuration: data.syntaxDiag,
// @ts-expect-error until ts 5.6
semanticDiagDuration: data.semanticDiag,
// @ts-expect-error until ts 5.6
suggestionDiagDuration: data.suggestionDiag,
// @ts-expect-error until ts 5.6
regionSemanticDiagDuration: data.regionSemanticDiag,
fileLineCount: data.fileLineCount,
},

1
extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
View File

@@ -191,7 +191,6 @@ export default class FileConfigurationManager extends Disposable {
includeCompletionsWithClassMemberSnippets: config.get<boolean>('suggest.classMemberSnippets.enabled', true),
includeCompletionsWithObjectLiteralMethodSnippets: config.get<boolean>('suggest.objectLiteralMethodSnippets.enabled', true),
autoImportFileExcludePatterns: this.getAutoImportFileExcludePatternsPreference(preferencesConfig, vscode.workspace.getWorkspaceFolder(document.uri)?.uri),
// @ts-expect-error until 5.6
autoImportSpecifierExcludeRegexes: preferencesConfig.get<string[]>('autoImportSpecifierExcludeRegexes'),
preferTypeOnlyAutoImports: preferencesConfig.get<boolean>('preferTypeOnlyAutoImports', false),
useLabelDetailsInCompletionEntries: true,

1
extensions/typescript-language-features/src/tsServer/server.ts
View File

@@ -166,7 +166,6 @@ export class SingleTsServer extends Disposable implements ITypeScriptServer {
this._tracer.traceRequestCompleted(this._serverId, 'requestCompleted', seq, callback);
callback.onSuccess(undefined);
}
// @ts-expect-error until ts 5.6
if ((event as Proto.RequestCompletedEvent).body.performanceData) {
this._onEvent.fire(event);
}

3
extensions/typescript-language-features/src/typeConverters.ts
View File

@@ -26,7 +26,6 @@ export namespace Range {
Math.max(0, start.line - 1), Math.max(start.offset - 1, 0),
Math.max(0, end.line - 1), Math.max(0, end.offset - 1));
// @ts-expect-error until ts 5.6
export const toFileRange = (range: vscode.Range): Proto.FileRange => ({
startLine: range.start.line + 1,
startOffset: range.start.character + 1,
@@ -38,7 +37,7 @@ export namespace Range {
file,
...toFileRange(range)
});
// @ts-expect-error until ts 5.6
export const toFileRangesRequestArgs = (file: string, ranges: vscode.Range[]): Proto.FileRangesRequestArgs => ({
file,
ranges: ranges.map(toFileRange)

3
extensions/typescript-language-features/src/typescriptServiceClient.ts
View File

@@ -983,7 +983,6 @@ export default class TypeScriptServiceClient extends Disposable implements IType
kind: getDiagnosticsKind(event),
resource: this.toResource(diagnosticEvent.body.file),
diagnostics: diagnosticEvent.body.diagnostics,
// @ts-expect-error until ts 5.6
spans: diagnosticEvent.body.spans,
});
}
@@ -1079,11 +1078,9 @@ export default class TypeScriptServiceClient extends Disposable implements IType
return;
case EventName.requestCompleted: {
// @ts-expect-error until ts 5.6
const diagnosticsDuration = (event.body as Proto.RequestCompletedEventBody).performanceData?.diagnosticsDuration;
if (diagnosticsDuration) {
this.diagnosticsManager.logDiagnosticsPerformanceTelemetry(
// @ts-expect-error until ts 5.6
diagnosticsDuration.map(fileData => {
const resource = this.toResource(fileData.file);
return {