aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorHannes De Valkeneer <[email protected]>2020-03-12 21:31:47 +0000
committerHannes De Valkeneer <[email protected]>2020-03-12 21:31:47 +0000
commit39c92b38726a4ca0e0e48198cbd5bdd82bbf2fb5 (patch)
tree7ed280f1150354957317b1c499f94289c4765cb0 /editors
parente9d025b618aaa1a5a06e60c17392a18f12471217 (diff)
fixup! feat: add debug code lens
autodetect vscode-lldb
Diffstat (limited to 'editors')
-rw-r--r--editors/code/package.json3
-rw-r--r--editors/code/src/client.ts1
-rw-r--r--editors/code/src/config.ts1
3 files changed, 2 insertions, 3 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index 744585721..1fe8e9f8a 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -51,9 +51,6 @@
51 "typescript-formatter": "^7.2.2", 51 "typescript-formatter": "^7.2.2",
52 "vsce": "^1.74.0" 52 "vsce": "^1.74.0"
53 }, 53 },
54 "extensionDependencies": [
55 "vadimcn.vscode-lldb"
56 ],
57 "activationEvents": [ 54 "activationEvents": [
58 "onLanguage:rust", 55 "onLanguage:rust",
59 "onCommand:rust-analyzer.analyzerStatus", 56 "onCommand:rust-analyzer.analyzerStatus",
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 6ce3b9235..99c9c5ae7 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -41,6 +41,7 @@ export async function createClient(config: Config, serverPath: string): Promise<
41 withSysroot: config.withSysroot, 41 withSysroot: config.withSysroot,
42 cargoFeatures: config.cargoFeatures, 42 cargoFeatures: config.cargoFeatures,
43 rustfmtArgs: config.rustfmtArgs, 43 rustfmtArgs: config.rustfmtArgs,
44 vscodeLldb: vscode.extensions.getExtension("vadimcn.vscode-lldb") != null,
44 }, 45 },
45 traceOutputChannel, 46 traceOutputChannel,
46 middleware: { 47 middleware: {
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 3ade7e900..40f4c7a0d 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -156,6 +156,7 @@ export class Config {
156 get featureFlags() { return this.cfg.get("featureFlags") as Record<string, boolean>; } 156 get featureFlags() { return this.cfg.get("featureFlags") as Record<string, boolean>; }
157 get additionalOutDirs() { return this.cfg.get("additionalOutDirs") as Record<string, string>; } 157 get additionalOutDirs() { return this.cfg.get("additionalOutDirs") as Record<string, string>; }
158 get rustfmtArgs() { return this.cfg.get("rustfmtArgs") as string[]; } 158 get rustfmtArgs() { return this.cfg.get("rustfmtArgs") as string[]; }
159 get vscodeLldb() { return this.cfg.get("vscodeLldb") as boolean; }
159 160
160 get cargoWatchOptions(): CargoWatchOptions { 161 get cargoWatchOptions(): CargoWatchOptions {
161 return { 162 return {