about summary refs log tree commit diff
path: root/editors/code/package.json
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-04-27 20:41:35 +0000
committerGitHub <noreply@github.com>2021-04-27 20:41:35 +0000
commitfb45d2adeccfc6732b702cd8fa2911b385bc15b7 (patch)
tree41ab22e69528ccb346bc01b913f9251a24925960 /editors/code/package.json
parente2b87735cc4b54ca530e7a99070da585d480b1c3 (diff)
parent1b4197cb3520e4a71f118aac61a83bab1a6f5931 (diff)
downloadrust-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/package.json')
-rw-r--r--editors/code/package.json5
1 files changed, 3 insertions, 2 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index 97d92e43c82..35b50e669d3 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -353,8 +353,9 @@
                         "Use [MS C++ tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools)"
                     ]
                 },
-                "rust-analyzer.debug.sourceFileMap": {
-                    "type": "object",
+                "rust-analyzer.debug.sourceFileMap": {                    
+                    "type": ["object", "string"],
+                    "const": "auto",
                     "description": "Optional source file mappings passed to the debug engine.",
                     "default": {
                         "/rustc/<id>": "${env:USERPROFILE}/.rustup/toolchains/<toolchain-id>/lib/rustlib/src/rust"