language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Set RUSTC_SYSROOT for runnables

Browse source
This commit is contained in:
Lukas Wirth 2024-07-16 13:35:14 +02:00
parent 2346a80ab4
commit 33ce9a4211
8 changed files with 59 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

7
editors/code/src/run.ts
View file

@ -8,7 +8,6 @@ import { makeDebugConfig } from "./debug";
import type { Config, RunnableEnvCfg, RunnableEnvCfgItem } from "./config";
import type { LanguageClient } from "vscode-languageclient/node";
import { unwrapUndefinable, type RustEditor } from "./util";
import * as toolchain from "./toolchain";
const quickPickButtons = [
{ iconPath: new vscode.ThemeIcon("save"), tooltip: "Save as a launch.json configuration." },
@ -115,7 +114,7 @@ export async function createTaskFromRunnable(
let definition: tasks.TaskDefinition;
let options;
let cargo;
let cargo = "cargo";
if (runnable.kind === "cargo") {
const runnableArgs = runnable.args;
let args = createCargoArgs(runnableArgs);
@ -126,8 +125,6 @@ export async function createTaskFromRunnable(
cargo = unwrapUndefinable(cargoParts[0]);
args = [...cargoParts.slice(1), ...args];
} else {
cargo = await toolchain.cargoPath();
}
definition = {
@ -200,7 +197,7 @@ async function getRunnables(
continue;
}
if (debuggeeOnly && (r.label.startsWith("doctest") || r.label.startsWith("cargo"))) {
if (debuggeeOnly && r.label.startsWith("doctest")) {
continue;
}
items.push(new RunnableQuickPick(r));