bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'editors/code/src/tasks.ts')
-rw-r--r--editors/code/src/tasks.ts50
1 files changed, 21 insertions, 29 deletions
diff --git a/editors/code/src/tasks.ts b/editors/code/src/tasks.ts
index 1d5ab82aa0..89abb37b0e 100644
--- a/editors/code/src/tasks.ts
+++ b/editors/code/src/tasks.ts
@@ -2,22 +2,20 @@ import * as vscode from "vscode";
import * as toolchain from "./toolchain";
import type { Config } from "./config";
import { log } from "./util";
-import { unwrapUndefinable } from "./undefinable";
// This ends up as the `type` key in tasks.json. RLS also uses `cargo` and
// our configuration should be compatible with it so use the same key.
export const TASK_TYPE = "cargo";
export const TASK_SOURCE = "rust";
-export interface CargoTaskDefinition extends vscode.TaskDefinition {
- command?: string;
- args?: string[];
+export interface RustTargetDefinition extends vscode.TaskDefinition {
+ program: string;
+ args: string[];
cwd?: string;
env?: { [key: string]: string };
- overrideCargo?: string;
}
-class CargoTaskProvider implements vscode.TaskProvider {
+class RustTaskProvider implements vscode.TaskProvider {
private readonly config: Config;
constructor(config: Config) {
@@ -39,14 +37,15 @@ class CargoTaskProvider implements vscode.TaskProvider {
{ command: "run", group: undefined },
];
+ const cargoPath = await toolchain.cargoPath();
+
const tasks: vscode.Task[] = [];
for (const workspaceTarget of vscode.workspace.workspaceFolders || []) {
for (const def of defs) {
- const vscodeTask = await buildCargoTask(
+ const vscodeTask = await buildRustTask(
workspaceTarget,
- { type: TASK_TYPE, command: def.command },
+ { type: TASK_TYPE, program: cargoPath, args: [def.command] },
`cargo ${def.command}`,
- [def.command],
this.config.problemMatcher,
this.config.cargoRunner,
);
@@ -63,15 +62,13 @@ class CargoTaskProvider implements vscode.TaskProvider {
// we need to inform VSCode how to execute that command by creating
// a ShellExecution for it.
- const definition = task.definition as CargoTaskDefinition;
+ const definition = task.definition as RustTargetDefinition;
- if (definition.type === TASK_TYPE && definition.command) {
- const args = [definition.command].concat(definition.args ?? []);
- return await buildCargoTask(
+ if (definition.type === TASK_TYPE) {
+ return await buildRustTask(
task.scope,
definition,
task.name,
- args,
this.config.problemMatcher,
this.config.cargoRunner,
);
@@ -81,11 +78,10 @@ class CargoTaskProvider implements vscode.TaskProvider {
}
}
-export async function buildCargoTask(
+export async function buildRustTask(
scope: vscode.WorkspaceFolder | vscode.TaskScope | undefined,
- definition: CargoTaskDefinition,
+ definition: RustTargetDefinition,
name: string,
- args: string[],
problemMatcher: string[],
customRunner?: string,
throwOnError: boolean = false,
@@ -95,7 +91,12 @@ export async function buildCargoTask(
if (customRunner) {
const runnerCommand = `${customRunner}.buildShellExecution`;
try {
- const runnerArgs = { kind: TASK_TYPE, args, cwd: definition.cwd, env: definition.env };
+ const runnerArgs = {
+ kind: TASK_TYPE,
+ args: definition.args,
+ cwd: definition.cwd,
+ env: definition.env,
+ };
const customExec = await vscode.commands.executeCommand(runnerCommand, runnerArgs);
if (customExec) {
if (customExec instanceof vscode.ShellExecution) {
@@ -113,16 +114,7 @@ export async function buildCargoTask(
}
if (!exec) {
- // Check whether we must use a user-defined substitute for cargo.
- // Split on spaces to allow overrides like "wrapper cargo".
- const overrideCargo = definition.overrideCargo ?? definition.overrideCargo;
- const cargoPath = await toolchain.cargoPath();
- const cargoCommand = overrideCargo?.split(" ") ?? [cargoPath];
-
- const fullCommand = [...cargoCommand, ...args];
-
- const processName = unwrapUndefinable(fullCommand[0]);
- exec = new vscode.ProcessExecution(processName, fullCommand.slice(1), definition);
+ exec = new vscode.ProcessExecution(definition.program, definition.args, definition);
}
return new vscode.Task(
@@ -138,6 +130,6 @@ export async function buildCargoTask(
}
export function activateTaskProvider(config: Config): vscode.Disposable {
- const provider = new CargoTaskProvider(config);
+ const provider = new RustTaskProvider(config);
return vscode.tasks.registerTaskProvider(TASK_TYPE, provider);
}