From 1ef43047055b70b58c6b4c4b644aa084e41fcf2b Mon Sep 17 00:00:00 2001 From: Allison Chou Date: Wed, 1 Mar 2023 11:45:28 -0800 Subject: [PATCH 1/2] Clean up floating promise warnings --- .../src/CodeActions/CodeActionsHandler.ts | 7 +++---- .../ColorPresentation/ColorPresentationHandler.ts | 3 +-- .../src/DocumentColor/DocumentColorHandler.ts | 3 +-- .../src/Folding/FoldingRangeHandler.ts | 3 +-- .../src/Formatting/FormattingHandler.ts | 3 +-- .../src/Formatting/RazorFormattingFeature.ts | 3 +-- .../src/Semantic/SemanticTokensRangeHandler.ts | 3 +-- .../src/extension.ts | 12 ++++++------ 8 files changed, 15 insertions(+), 22 deletions(-) diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/CodeActions/CodeActionsHandler.ts b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/CodeActions/CodeActionsHandler.ts index c01454d47d0..e86812cb357 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/CodeActions/CodeActionsHandler.ts +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/CodeActions/CodeActionsHandler.ts @@ -22,9 +22,8 @@ export class CodeActionsHandler { private readonly serverClient: RazorLanguageServerClient, private readonly logger: RazorLogger) { } - public register() { - // tslint:disable-next-line: no-floating-promises - this.serverClient.onRequestWithParams( + public async register() { + await this.serverClient.onRequestWithParams( this.codeActionRequestType, async (request, token) => this.provideCodeActions(request, token)); } @@ -62,6 +61,6 @@ export class CodeActionsHandler { } private commandAsCodeAction(command: vscode.Command): RazorCodeAction { - return { title: command.title, data: { CustomTags: [ 'CodeActionFromVSCode' ] } } as RazorCodeAction; + return { title: command.title, data: { CustomTags: ['CodeActionFromVSCode'] } } as RazorCodeAction; } } diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/ColorPresentation/ColorPresentationHandler.ts b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/ColorPresentation/ColorPresentationHandler.ts index 330620038b2..5feca93009f 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/ColorPresentation/ColorPresentationHandler.ts +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/ColorPresentation/ColorPresentationHandler.ts @@ -26,8 +26,7 @@ export class ColorPresentationHandler { } public register() { - // tslint:disable-next-line: no-floating-promises - this.serverClient.onRequestWithParams( + return this.serverClient.onRequestWithParams( this.colorPresentationRequestType, async (request: SerializableColorPresentationParams, token: vscode.CancellationToken) => this.provideHtmlColorPresentation(request, token)); } diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/DocumentColor/DocumentColorHandler.ts b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/DocumentColor/DocumentColorHandler.ts index abafbe89cf5..aa70568b9c8 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/DocumentColor/DocumentColorHandler.ts +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/DocumentColor/DocumentColorHandler.ts @@ -23,8 +23,7 @@ export class DocumentColorHandler { private readonly logger: RazorLogger) { } public register() { - // tslint:disable-next-line: no-floating-promises - this.serverClient.onRequestWithParams( + return this.serverClient.onRequestWithParams( this.documentColorRequestType, async (request: SerializableDocumentColorParams, token: vscode.CancellationToken) => this.provideHtmlDocumentColors(request, token)); } diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Folding/FoldingRangeHandler.ts b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Folding/FoldingRangeHandler.ts index e6815407641..ea8d199bb36 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Folding/FoldingRangeHandler.ts +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Folding/FoldingRangeHandler.ts @@ -22,8 +22,7 @@ export class FoldingRangeHandler { private readonly logger: RazorLogger) { } public register() { - // tslint:disable-next-line: no-floating-promises - this.serverClient.onRequestWithParams( + return this.serverClient.onRequestWithParams( this.foldingRangeRequestType, async (request, token) => this.provideFoldingRanges(request, token)); } diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Formatting/FormattingHandler.ts b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Formatting/FormattingHandler.ts index 5c6858a473e..36be596695f 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Formatting/FormattingHandler.ts +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Formatting/FormattingHandler.ts @@ -23,8 +23,7 @@ export class FormattingHandler { private readonly logger: RazorLogger) { } public register() { - // tslint:disable-next-line: no-floating-promises - this.serverClient.onRequestWithParams( + return this.serverClient.onRequestWithParams( this.formattingRequestType, async (request, token) => this.provideFormatting(request, token)); } diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Formatting/RazorFormattingFeature.ts b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Formatting/RazorFormattingFeature.ts index 631106d2d0e..5bc8dcfd992 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Formatting/RazorFormattingFeature.ts +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Formatting/RazorFormattingFeature.ts @@ -26,8 +26,7 @@ export class RazorFormattingFeature { } public register() { - // tslint:disable-next-line: no-floating-promises - this.serverClient.onRequestWithParams( + return this.serverClient.onRequestWithParams( this.rangeFormattingRequestType, async (request, token) => this.handleRangeFormatting(request, token)); } diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Semantic/SemanticTokensRangeHandler.ts b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Semantic/SemanticTokensRangeHandler.ts index 8bf1e55c9f7..e18fd45411f 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Semantic/SemanticTokensRangeHandler.ts +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/Semantic/SemanticTokensRangeHandler.ts @@ -21,8 +21,7 @@ export class SemanticTokensRangeHandler { constructor(private readonly serverClient: RazorLanguageServerClient) { } public register() { - // tslint:disable-next-line: no-floating-promises - this.serverClient.onRequestWithParams( + return this.serverClient.onRequestWithParams( this.semanticTokensRequestType, async (request: SerializableSemanticTokensParams, token: vscode.CancellationToken) => this.getSemanticTokens(request, token)); } diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/extension.ts b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/extension.ts index bb4fdd90620..4d4b135c00d 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/extension.ts +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/extension.ts @@ -199,13 +199,13 @@ export async function activate(vscodeType: typeof vscodeapi, context: ExtensionC await proposedApisFeature.register(vscodeType, localRegistrations); } - razorFormattingFeature.register(); razorCodeActionRunner.register(); - colorPresentationHandler.register(); - documentColorHandler.register(); - foldingRangeHandler.register(); - formattingHandler.register(); - semanticTokenHandler.register(); + await razorFormattingFeature.register(); + await colorPresentationHandler.register(); + await documentColorHandler.register(); + await foldingRangeHandler.register(); + await formattingHandler.register(); + await semanticTokenHandler.register(); }); const onStopRegistration = languageServerClient.onStop(() => { From 0edd12521dc444dddf0d20284291c0c9e83c6e75 Mon Sep 17 00:00:00 2001 From: Allison Chou Date: Wed, 1 Mar 2023 11:46:53 -0800 Subject: [PATCH 2/2] Clean up floating promise warnings --- .../src/CodeActions/CodeActionsHandler.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/CodeActions/CodeActionsHandler.ts b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/CodeActions/CodeActionsHandler.ts index e86812cb357..cb3608e4bc4 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/CodeActions/CodeActionsHandler.ts +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode/src/CodeActions/CodeActionsHandler.ts @@ -22,8 +22,8 @@ export class CodeActionsHandler { private readonly serverClient: RazorLanguageServerClient, private readonly logger: RazorLogger) { } - public async register() { - await this.serverClient.onRequestWithParams( + public register() { + return this.serverClient.onRequestWithParams( this.codeActionRequestType, async (request, token) => this.provideCodeActions(request, token)); }