Skip to content

Commit

Permalink
prettier format
Browse files Browse the repository at this point in the history
  • Loading branch information
kouhe3 committed Oct 8, 2024
1 parent 3918e29 commit a2304ba
Showing 1 changed file with 13 additions and 14 deletions.
27 changes: 13 additions & 14 deletions src/tools/rust-analyzer/editors/code/src/debug.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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 { execSync } from "node:child_process";
import { execute, isCargoRunnableArgs, unwrapUndefinable } from "./util";
import type { Config } from "./config";

Expand Down Expand Up @@ -110,9 +110,9 @@ async function getDebugConfiguration(

await vscode.window.showErrorMessage(
`Install [CodeLLDB](command:${commandCodeLLDB} "Open CodeLLDB")` +
`, [lldb-dap](command:${commandLLDBDap} "Open lldb-dap")` +
`, [C/C++](command:${commandCCpp} "Open C/C++") ` +
`or [Native Debug](command:${commandNativeDebug} "Open Native Debug") for debugging.`,
`, [lldb-dap](command:${commandLLDBDap} "Open lldb-dap")` +
`, [C/C++](command:${commandCCpp} "Open C/C++") ` +
`or [Native Debug](command:${commandNativeDebug} "Open Native Debug") for debugging.`,
);
return;
}
Expand All @@ -130,7 +130,7 @@ async function getDebugConfiguration(
!isMultiFolderWorkspace || !runnableArgs.workspaceRoot
? firstWorkspace
: workspaceFolders.find((w) => runnableArgs.workspaceRoot?.includes(w.uri.fsPath)) ||
firstWorkspace;
firstWorkspace;

const workspace = unwrapUndefinable(maybeWorkspace);
let wsFolder = path.normalize(workspace.uri.fsPath);
Expand Down Expand Up @@ -237,15 +237,15 @@ const knownEngines: {
runnableArgs.executableArgs,
],
additional: {
"sourceMap": [
sourceMap: [
[
`/rustc/${/commit-hash:\s(.*)$/m.exec(execSync("rustc -V -v", {}).toString())?.[1]
}/library`,
"${config:rust-analyzer.cargo.sysroot}/lib/rustlib/src/rust/library"

]
]
}
`/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",
Expand Down Expand Up @@ -366,7 +366,6 @@ type LldbDapDebugConfig = {
sourceMap: [string, string][];
} & BaseDebugConfig<"lldb-dap">;


type CodeLldbDebugConfig = {
program: string;
args: string[];
Expand Down

0 comments on commit a2304ba

Please sign in to comment.