Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 13:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18265 - kouhe3:master, r=Veykril

Browse source 
Add support for LLDB-DAP
This commit is contained in:
bors 2024-10-14 12:21:42 +00:00
commit 0402da4cbf
1 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
editors/code/src/debug.ts
View file

@ -6,6 +6,7 @@ import type * as ra from "./lsp_ext";
import { Cargo } from "./toolchain"; import { Cargo } from "./toolchain";
import type { Ctx } from "./ctx"; import type { Ctx } from "./ctx";
import { createTaskFromRunnable, prepareEnv } from "./run"; import { createTaskFromRunnable, prepareEnv } from "./run";
import { execSync } from "node:child_process";
import { execute, isCargoRunnableArgs, unwrapUndefinable } from "./util"; import { execute, isCargoRunnableArgs, unwrapUndefinable } from "./util";
import type { Config } from "./config"; import type { Config } from "./config";
@ -105,9 +106,11 @@ async function getDebugConfiguration(
const commandCCpp: string = createCommandLink("ms-vscode.cpptools"); const commandCCpp: string = createCommandLink("ms-vscode.cpptools");
const commandCodeLLDB: string = createCommandLink("vadimcn.vscode-lldb"); const commandCodeLLDB: string = createCommandLink("vadimcn.vscode-lldb");
const commandNativeDebug: string = createCommandLink("webfreak.debug"); const commandNativeDebug: string = createCommandLink("webfreak.debug");
const commandLLDBDap: string = createCommandLink("llvm-vs-code-extensions.lldb-dap");
await vscode.window.showErrorMessage( await vscode.window.showErrorMessage(
`Install [CodeLLDB](command:${commandCodeLLDB} "Open CodeLLDB")` + `Install [CodeLLDB](command:${commandCodeLLDB} "Open CodeLLDB")` +
`, [lldb-dap](command:${commandLLDBDap} "Open lldb-dap")` +
`, [C/C++](command:${commandCCpp} "Open C/C++") ` + `, [C/C++](command:${commandCCpp} "Open C/C++") ` +
`or [Native Debug](command:${commandNativeDebug} "Open Native Debug") for debugging.`, `or [Native Debug](command:${commandNativeDebug} "Open Native Debug") for debugging.`,
); );
@ -220,10 +223,30 @@ type DebugConfigProvider<Type extends string, DebugConfig extends BaseDebugConfi
type KnownEnginesType = (typeof knownEngines)[keyof typeof knownEngines]; type KnownEnginesType = (typeof knownEngines)[keyof typeof knownEngines];
const knownEngines: { const knownEngines: {
"llvm-vs-code-extensions.lldb-dap": DebugConfigProvider<"lldb-dap", LldbDapDebugConfig>;
"vadimcn.vscode-lldb": DebugConfigProvider<"lldb", CodeLldbDebugConfig>; "vadimcn.vscode-lldb": DebugConfigProvider<"lldb", CodeLldbDebugConfig>;
"ms-vscode.cpptools": DebugConfigProvider<"cppvsdbg" | "cppdbg", CCppDebugConfig>; "ms-vscode.cpptools": DebugConfigProvider<"cppvsdbg" | "cppdbg", CCppDebugConfig>;
"webfreak.debug": DebugConfigProvider<"gdb", NativeDebugConfig>; "webfreak.debug": DebugConfigProvider<"gdb", NativeDebugConfig>;
} = { } = {
"llvm-vs-code-extensions.lldb-dap": {
type: "lldb-dap",
executableProperty: "program",
environmentProperty: (env) => ["env", Object.entries(env).map(([k, v]) => `${k}=${v}`)],
runnableArgsProperty: (runnableArgs: ra.CargoRunnableArgs) => [
"args",
runnableArgs.executableArgs,
],
additional: {
sourceMap: [
[
`/rustc/${/commit-hash:\s(.*)$/m.exec(
execSync("rustc -V -v", {}).toString(),
)?.[1]}/library`,
"${config:rust-analyzer.cargo.sysroot}/lib/rustlib/src/rust/library",
],
],
},
},
"vadimcn.vscode-lldb": { "vadimcn.vscode-lldb": {
type: "lldb", type: "lldb",
executableProperty: "program", executableProperty: "program",
@ -336,6 +359,13 @@ type CCppDebugConfig = {
}; };
} & BaseDebugConfig<"cppvsdbg" | "cppdbg">; } & BaseDebugConfig<"cppvsdbg" | "cppdbg">;
type LldbDapDebugConfig = {
program: string;
args: string[];
env: string[];
sourceMap: [string, string][];
} & BaseDebugConfig<"lldb-dap">;
type CodeLldbDebugConfig = { type CodeLldbDebugConfig = {
program: string; program: string;
args: string[]; args: string[];