diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-04-27 20:41:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 20:41:35 +0000 |
| commit | fb45d2adeccfc6732b702cd8fa2911b385bc15b7 (patch) | |
| tree | 41ab22e69528ccb346bc01b913f9251a24925960 /editors/code/src/debug.ts | |
| parent | e2b87735cc4b54ca530e7a99070da585d480b1c3 (diff) | |
| parent | 1b4197cb3520e4a71f118aac61a83bab1a6f5931 (diff) | |
| download | rust-fb45d2adeccfc6732b702cd8fa2911b385bc15b7.tar.gz rust-fb45d2adeccfc6732b702cd8fa2911b385bc15b7.zip | |
Merge #8624
8624: Automatically detect rust library source file map r=vsrs a=vsrs
This PR adds a new possible `rust-analyzer.debug.sourceFileMap` value:
```json
{
"rust-analyzer.debug.sourceFileMap": "auto"
}
```
I did not make it the default because it uses two shell calls (`rustc --print sysroot` and `rustc -V -v`). First one can be slow (https://github.com/rust-lang/rustup/issues/783)
Fixes #8619
Co-authored-by: vsrs <vit@conrlab.com>
Diffstat (limited to 'editors/code/src/debug.ts')
| -rw-r--r-- | editors/code/src/debug.ts | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/editors/code/src/debug.ts b/editors/code/src/debug.ts index 3889a277304..830980f968c 100644 --- a/editors/code/src/debug.ts +++ b/editors/code/src/debug.ts @@ -3,7 +3,7 @@ import * as vscode from 'vscode'; import * as path from 'path'; import * as ra from './lsp_ext'; -import { Cargo } from './toolchain'; +import { Cargo, getRustcId, getSysroot } from './toolchain'; import { Ctx } from "./ctx"; import { prepareEnv } from "./run"; @@ -104,7 +104,17 @@ async function getDebugConfiguration(ctx: Ctx, runnable: ra.Runnable): Promise<v const executable = await getDebugExecutable(runnable); const env = prepareEnv(runnable, ctx.config.runnableEnv); - const debugConfig = knownEngines[debugEngine.id](runnable, simplifyPath(executable), env, debugOptions.sourceFileMap); + let sourceFileMap = debugOptions.sourceFileMap; + if (sourceFileMap === "auto") { + // let's try to use the default toolchain + const commitHash = await getRustcId(wsFolder); + const sysroot = await getSysroot(wsFolder); + const rustlib = path.normalize(sysroot + "/lib/rustlib/src/rust"); + sourceFileMap = {}; + sourceFileMap[`/rustc/${commitHash}/`] = rustlib; + } + + const debugConfig = knownEngines[debugEngine.id](runnable, simplifyPath(executable), env, sourceFileMap); if (debugConfig.type in debugOptions.engineSettings) { const settingsMap = (debugOptions.engineSettings as any)[debugConfig.type]; for (var key in settingsMap) { |
