Unnamed repository; edit this file 'description' to name the repository.
fix lints
| -rw-r--r-- | editors/code/src/commands.ts | 4 | ||||
| -rw-r--r-- | editors/code/src/ctx.ts | 21 |
2 files changed, 12 insertions, 13 deletions
diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts index 253a7383a5..d8e1886de3 100644 --- a/editors/code/src/commands.ts +++ b/editors/code/src/commands.ts @@ -3,7 +3,7 @@ import * as lc from "vscode-languageclient"; import * as ra from "./lsp_ext"; import * as path from "path"; -import { type Ctx, type Cmd, type CtxInit } from "./ctx"; +import type { Ctx, Cmd, CtxInit } from "./ctx"; import { applySnippetWorkspaceEdit, applySnippetTextEdits } from "./snippets"; import { spawnSync } from "child_process"; import { type RunnableQuickPick, selectRunnable, createTask, createArgs } from "./run"; @@ -878,7 +878,7 @@ export function addProject(ctx: CtxInit): Cmd { } const command = `${extensionName}.discoverWorkspaceCommand`; - const project = (await vscode.commands.executeCommand(command)) as JsonProject; + const project = await vscode.commands.executeCommand(command); ctx.addToDiscoveredWorkspaces([project]); diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts index f0fc0d9f4e..40ca2097d5 100644 --- a/editors/code/src/ctx.ts +++ b/editors/code/src/ctx.ts @@ -30,12 +30,12 @@ import { bootstrap } from "./bootstrap"; export type Workspace = | { kind: "Empty" } | { - kind: "Workspace Folder"; - } + kind: "Workspace Folder"; + } | { - kind: "Detached Files"; - files: vscode.TextDocument[]; - }; + kind: "Detached Files"; + files: vscode.TextDocument[]; + }; export function fetchWorkspace(): Workspace { const folders = (vscode.workspace.workspaceFolders || []).filter( @@ -49,9 +49,9 @@ export function fetchWorkspace(): Workspace { ? rustDocuments.length === 0 ? { kind: "Empty" } : { - kind: "Detached Files", - files: rustDocuments, - } + kind: "Detached Files", + files: rustDocuments, + } : { kind: "Workspace Folder" }; } @@ -189,7 +189,7 @@ export class Ctx { if (this.config.discoverProjectRunner) { const command = `${this.config.discoverProjectRunner}.discoverWorkspaceCommand`; log.info(`running command: ${command}`); - const project = (await vscode.commands.executeCommand(command)) as JsonProject; + const project: JsonProject = await vscode.commands.executeCommand(command); this.addToDiscoveredWorkspaces([project]); } @@ -441,8 +441,7 @@ export class Ctx { } statusBar.tooltip.appendMarkdown("\n\n[Open Logs](command:rust-analyzer.openLogs)"); statusBar.tooltip.appendMarkdown( - `\n\n[${ - this.config.checkOnSave ? "Disable" : "Enable" + `\n\n[${this.config.checkOnSave ? "Disable" : "Enable" } Check on Save](command:rust-analyzer.toggleCheckOnSave)`, ); statusBar.tooltip.appendMarkdown( |