diff --git a/editors/code/package.json b/editors/code/package.json index ccf62d002bb..f1dd3aa79ff 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -1301,15 +1301,6 @@ "endsPattern": "^\\[Finished running\\b" }, "pattern": "$rustc" - }, - { - "name": "rustc-run", - "base": "$rustc", - "fileLocation": [ - "autoDetect", - "${command:rust-analyzer.cargoWorkspaceRootForCurrentRun}" - ], - "pattern": "$rustc-run" } ], "colors": [ diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts index 6b10073aa86..b9ad525e361 100644 --- a/editors/code/src/commands.ts +++ b/editors/code/src/commands.ts @@ -842,7 +842,6 @@ export function run(ctx: Ctx): Cmd { item.detail = "rerun"; prevRunnable = item; const task = await createTask(item.runnable, ctx.config); - ctx.cargoWorkspaceRootForCurrentRun = item.cargoWorkspaceRoot; return await vscode.tasks.executeTask(task); }; } @@ -947,6 +946,3 @@ export function linkToCommand(ctx: Ctx): Cmd { } }; } -export function getCargoWorkspaceDir(ctx: Ctx): Cmd { - return async () => ctx.cargoWorkspaceRootForCurrentRun; -} diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts index b6c0eedfb16..26510011d43 100644 --- a/editors/code/src/ctx.ts +++ b/editors/code/src/ctx.ts @@ -17,10 +17,6 @@ export type Workspace = }; export class Ctx { - // Helps VS Code to correctly link problems from runnables. This is used by - // `rust-analyzer.cargoWorkspaceRootForCurrentRun` command of $rustc-run problem matcher. - cargoWorkspaceRootForCurrentRun?: string = undefined; - private constructor( readonly config: Config, private readonly extCtx: vscode.ExtensionContext, diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts index 6e6c2513dd9..41bde4195e0 100644 --- a/editors/code/src/main.ts +++ b/editors/code/src/main.ts @@ -189,7 +189,6 @@ async function initCommonContext(context: vscode.ExtensionContext, ctx: Ctx) { ctx.registerCommand("resolveCodeAction", commands.resolveCodeAction); ctx.registerCommand("applyActionGroup", commands.applyActionGroup); ctx.registerCommand("gotoLocation", commands.gotoLocation); - ctx.registerCommand("cargoWorkspaceRootForCurrentRun", commands.getCargoWorkspaceDir); ctx.registerCommand("linkToCommand", commands.linkToCommand); } diff --git a/editors/code/src/run.ts b/editors/code/src/run.ts index 100c0fe2d8c..22e5eda6827 100644 --- a/editors/code/src/run.ts +++ b/editors/code/src/run.ts @@ -89,14 +89,12 @@ export async function selectRunnable( export class RunnableQuickPick implements vscode.QuickPickItem { public label: string; - public cargoWorkspaceRoot?: string; public description?: string | undefined; public detail?: string | undefined; public picked?: boolean | undefined; constructor(public runnable: ra.Runnable) { this.label = runnable.label; - this.cargoWorkspaceRoot = runnable.args.workspaceRoot; } } diff --git a/editors/code/src/tasks.ts b/editors/code/src/tasks.ts index 44697f95bab..e6239deeb21 100644 --- a/editors/code/src/tasks.ts +++ b/editors/code/src/tasks.ts @@ -128,7 +128,7 @@ export async function buildCargoTask( name, TASK_SOURCE, exec, - ["$rustc-run"] + ["$rustc"] ); }