mirror of
https://github.com/rust-lang/rust-analyzer
synced 2025-01-13 21:54:42 +00:00
fix array sourceMap
This commit is contained in:
parent
82b114dbf0
commit
64caa6bbf1
1 changed files with 18 additions and 8 deletions
|
@ -6,6 +6,7 @@ import type * as ra from "./lsp_ext";
|
|||
import { Cargo } from "./toolchain";
|
||||
import type { Ctx } from "./ctx";
|
||||
import { createTaskFromRunnable, prepareEnv } from "./run";
|
||||
import { execSync } from 'node:child_process'
|
||||
import { execute, isCargoRunnableArgs, unwrapUndefinable } from "./util";
|
||||
import type { Config } from "./config";
|
||||
|
||||
|
@ -227,16 +228,25 @@ const knownEngines: {
|
|||
"ms-vscode.cpptools": DebugConfigProvider<"cppvsdbg" | "cppdbg", CCppDebugConfig>;
|
||||
"webfreak.debug": DebugConfigProvider<"gdb", NativeDebugConfig>;
|
||||
} = {
|
||||
"llvm-vs-code-extensions.lldb-dap":{
|
||||
"llvm-vs-code-extensions.lldb-dap": {
|
||||
type: "lldb-dap",
|
||||
executableProperty: "program",
|
||||
environmentProperty: (env) => ["env", Object.entries(env).map(([k,v])=>`${k}=${v}`)],
|
||||
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": {
|
||||
type: "lldb",
|
||||
executableProperty: "program",
|
||||
|
@ -353,7 +363,7 @@ type LldbDapDebugConfig = {
|
|||
program: string;
|
||||
args: string[];
|
||||
env: string[];
|
||||
sourceMap: [string,string][];
|
||||
sourceMap: [string, string][];
|
||||
} & BaseDebugConfig<"lldb-dap">;
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue