diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts index cbda619ea9..3469fe5ec4 100644 --- a/editors/code/src/commands.ts +++ b/editors/code/src/commands.ts @@ -129,7 +129,8 @@ export function joinLines(ctx: Ctx): Cmd { client.protocol2CodeConverter.asTextEdits(items).forEach((edit: any) => { builder.replace(edit.range, edit.newText); }); - }); + }) + .then(() => {}, console.error); }; } @@ -246,7 +247,8 @@ export function ssr(ctx: Ctx): Cmd { }); await vscode.workspace.applyEdit(client.protocol2CodeConverter.asWorkspaceEdit(edit)); - }); + }) + .then(() => {}, console.error); }; } @@ -465,7 +467,8 @@ export function showReferences(ctx: Ctx): Cmd { vscode.Uri.parse(uri), client.protocol2CodeConverter.asPosition(position), locations.map(client.protocol2CodeConverter.asLocation), - ); + ) + .then(() => {}, console.error); } }; } @@ -477,7 +480,8 @@ export function applyActionGroup(_ctx: Ctx): Cmd { vscode.commands.executeCommand( 'rust-analyzer.resolveCodeAction', selectedAction.arguments, - ); + ) + .then(() => {}, console.error); }; } @@ -510,7 +514,8 @@ export function openDocs(ctx: Ctx): Cmd { const doclink = await client.sendRequest(ra.openDocs, { position, textDocument }); if (doclink != null) { - vscode.commands.executeCommand("vscode.open", vscode.Uri.parse(doclink)); + vscode.commands.executeCommand("vscode.open", vscode.Uri.parse(doclink)) + .then(() => {}, console.error); } }; diff --git a/editors/code/src/debug.ts b/editors/code/src/debug.ts index 874b858d9e..0bbaae2b0a 100644 --- a/editors/code/src/debug.ts +++ b/editors/code/src/debug.ts @@ -78,7 +78,8 @@ async function getDebugConfiguration(ctx: Ctx, runnable: ra.Runnable): Promise {}, console.error); return; } diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts index 1900d900af..a5c728b675 100644 --- a/editors/code/src/main.ts +++ b/editors/code/src/main.ts @@ -76,7 +76,8 @@ async function tryActivate(context: vscode.ExtensionContext) { // This a horribly, horribly wrong way to deal with this problem. ctx = await Ctx.create(config, context, serverPath, workspaceFolder.uri.fsPath); - setContextValue(RUST_PROJECT_CONTEXT_NAME, true); + setContextValue(RUST_PROJECT_CONTEXT_NAME, true) + .then(() => {}, console.error); // Commands which invokes manually via command palette, shortcut, etc. @@ -142,7 +143,8 @@ async function tryActivate(context: vscode.ExtensionContext) { } export async function deactivate() { - setContextValue(RUST_PROJECT_CONTEXT_NAME, undefined); + setContextValue(RUST_PROJECT_CONTEXT_NAME, undefined) + .then(() => {}, console.error); await ctx?.client.stop(); ctx = undefined; } @@ -186,7 +188,8 @@ async function bootstrapExtension(config: Config, state: PersistentState): Promi }).catch((e) => { log.error(e); if (state.releaseId === undefined) { // Show error only for the initial download - vscode.window.showErrorMessage(`Failed to download rust-analyzer nightly ${e}`); + vscode.window.showErrorMessage(`Failed to download rust-analyzer nightly ${e}`) + .then(() => {}, console.error); } return undefined; }); @@ -305,7 +308,7 @@ async function getServer(config: Config, state: PersistentState): Promise {}, console.error); return undefined; } const ext = platform.indexOf("-windows-") !== -1 ? ".exe" : ""; @@ -433,6 +436,7 @@ function warnAboutExtensionConflicts() { vscode.window.showWarningMessage( `You have both the ${fst[0]} (${fst[1]}) and ${sec[0]} (${sec[1]}) ` + "plugins enabled. These are known to conflict and cause various functions of " + - "both plugins to not work correctly. You should disable one of them.", "Got it"); + "both plugins to not work correctly. You should disable one of them.", "Got it") + .then(() => {}, console.error); }; } diff --git a/editors/code/src/run.ts b/editors/code/src/run.ts index 50c17bc7f1..e30fdb38e6 100644 --- a/editors/code/src/run.ts +++ b/editors/code/src/run.ts @@ -45,7 +45,8 @@ export async function selectRunnable(ctx: Ctx, prevRunnable?: RunnableQuickPick, if (items.length === 0) { // it is the debug case, run always has at least 'cargo check ...' // see crates\rust-analyzer\src\main_loop\handlers.rs, handle_runnables - vscode.window.showErrorMessage("There's no debug target!"); + vscode.window.showErrorMessage("There's no debug target!") + .then(() => {}, console.error); return; }