From 39c92b38726a4ca0e0e48198cbd5bdd82bbf2fb5 Mon Sep 17 00:00:00 2001 From: Hannes De Valkeneer Date: Thu, 12 Mar 2020 22:31:47 +0100 Subject: fixup! feat: add debug code lens autodetect vscode-lldb --- editors/code/package.json | 3 --- editors/code/src/client.ts | 1 + editors/code/src/config.ts | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'editors') 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 @@ "typescript-formatter": "^7.2.2", "vsce": "^1.74.0" }, - "extensionDependencies": [ - "vadimcn.vscode-lldb" - ], "activationEvents": [ "onLanguage:rust", "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< withSysroot: config.withSysroot, cargoFeatures: config.cargoFeatures, rustfmtArgs: config.rustfmtArgs, + vscodeLldb: vscode.extensions.getExtension("vadimcn.vscode-lldb") != null, }, traceOutputChannel, 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 { get featureFlags() { return this.cfg.get("featureFlags") as Record; } get additionalOutDirs() { return this.cfg.get("additionalOutDirs") as Record; } get rustfmtArgs() { return this.cfg.get("rustfmtArgs") as string[]; } + get vscodeLldb() { return this.cfg.get("vscodeLldb") as boolean; } get cargoWatchOptions(): CargoWatchOptions { return { -- cgit v1.2.3