language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-25 13:23:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

better configuration enum items

Browse source
This commit is contained in:
vsrs 2020-04-29 14:13:57 +03:00
parent 042917e6e3
commit 9153e96e88
3 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
editors/code/package.json
View file

@ -390,22 +390,25 @@
"default": false "default": false
}, },
"rust-analyzer.debug.engine": { "rust-analyzer.debug.engine": {
"type": [ "type": "string",
"null",
"string"
],
"enum": [ "enum": [
"ms-vscode.cpptools", "auto",
"vadimcn.vscode-lldb" "vadimcn.vscode-lldb",
"ms-vscode.cpptools"
], ],
"default": null, "default": "auto",
"description": "Preffered debug engine." "description": "Preffered debug engine.",
"markdownEnumDescriptions": [
"First try to use [CodeLLDB](https://marketplace.visualstudio.com/items?itemName=vadimcn.vscode-lldb), if it's not installed use [MS C++ tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools).",
"Use [CodeLLDB](https://marketplace.visualstudio.com/items?itemName=vadimcn.vscode-lldb)",
"Use [MS C++ tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools)"
]
}, },
"rust-analyzer.debug.sourceFileMap" : { "rust-analyzer.debug.sourceFileMap": {
"type":"object", "type": "object",
"description": "Optional source file mappings passed to the debug engine.", "description": "Optional source file mappings passed to the debug engine.",
"default": { "default": {
"<source-path>": "<target-path>" "/rustc/<id>": "${env:USERPROFILE}/.rustup/toolchains/<toolchain-id>/lib/rustlib/src/rust"
} }
} }
} }

2
editors/code/src/commands/runnables.ts
View file

@ -102,7 +102,7 @@ export function debugSingle(ctx: Ctx): Cmd {
let debugEngineId = ctx.config.debug.engine; let debugEngineId = ctx.config.debug.engine;
let debugEngine = null; let debugEngine = null;
if (!debugEngineId) { if ( debugEngineId === "auto" ) {
debugEngine = vscode.extensions.getExtension(lldbId); debugEngine = vscode.extensions.getExtension(lldbId);
if (!debugEngine) { if (!debugEngine) {
debugEngine = vscode.extensions.getExtension(cpptoolsId); debugEngine = vscode.extensions.getExtension(cpptoolsId);

2
editors/code/src/config.ts
View file

@ -109,7 +109,7 @@ export class Config {
get debug() { get debug() {
return { return {
engine: this.get<null | string>("debug.engine"), engine: this.get<string>("debug.engine"),
sourceFileMap: this.get<Record<string, string>>("debug.sourceFileMap"), sourceFileMap: this.get<Record<string, string>>("debug.sourceFileMap"),
}; };
} }