diff options
| author | vsrs <vit@conrlab.com> | 2020-05-14 11:12:10 +0300 |
|---|---|---|
| committer | vsrs <vit@conrlab.com> | 2020-05-14 11:12:10 +0300 |
| commit | 3ffc26eaebb1f9491477e99d5187b048bd489cd6 (patch) | |
| tree | 2c6a61803187848d2ec595e40c42edd320ac8e6c /editors/code/src/debug.ts | |
| parent | 9ebb2acdca6c711cff7bfc84a410794739092dbe (diff) | |
| download | rust-3ffc26eaebb1f9491477e99d5187b048bd489cd6.tar.gz rust-3ffc26eaebb1f9491477e99d5187b048bd489cd6.zip | |
Remove "rust-analyzer.debug.useLaunchJson" option
Diffstat (limited to 'editors/code/src/debug.ts')
| -rw-r--r-- | editors/code/src/debug.ts | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/editors/code/src/debug.ts b/editors/code/src/debug.ts index bbf3ff31204..b500fe029a5 100644 --- a/editors/code/src/debug.ts +++ b/editors/code/src/debug.ts @@ -98,18 +98,15 @@ export async function startDebugSession(ctx: Ctx, config: ra.Runnable): Promise< let debugConfig: vscode.DebugConfiguration | undefined = undefined; let message = ""; - if (ctx.config.debug.useLaunchJson) { - const wsLaunchSection = vscode.workspace.getConfiguration("launch"); - const configurations = wsLaunchSection.get<any[]>("configurations") || []; - - const index = configurations.findIndex(c => c.name === config.label); - if (-1 !== index) { - debugConfig = configurations[index]; - message = " (from launch.json)"; - debugOutput.clear(); - } - } - if (!debugConfig) { + const wsLaunchSection = vscode.workspace.getConfiguration("launch"); + const configurations = wsLaunchSection.get<any[]>("configurations") || []; + + const index = configurations.findIndex(c => c.name === config.label); + if (-1 !== index) { + debugConfig = configurations[index]; + message = " (from launch.json)"; + debugOutput.clear(); + } else { debugConfig = await getDebugConfiguration(ctx, config); } |
