diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-05-18 08:37:04 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-05-18 08:37:04 +0100 |
commit | c6ed08967193cadc927dfaf422601bcd160a6fc9 (patch) | |
tree | aaccb210353786d000a3455264e368b76f61ff98 /editors/code/src/commands | |
parent | 31611da2538e66027ea67482235f6b8659bedf09 (diff) | |
parent | 78817a319476d8af40c4f78e8c47dc958781f88f (diff) |
Merge #4499
4499: CodeLens configuration options r=vsrs a=vsrs
This PR
- adds an option to granularly enable\disable all CodeLens, just like the TypeScript extension.
- fixes a minor bug for doctests. It makes no sense to show `Debug` lens for them as cargo `Can't skip running doc tests with --no-run`.
Co-authored-by: vsrs <[email protected]>
Diffstat (limited to 'editors/code/src/commands')
-rw-r--r-- | editors/code/src/commands/runnables.ts | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/editors/code/src/commands/runnables.ts b/editors/code/src/commands/runnables.ts index b1d93fc34..0bd30fb07 100644 --- a/editors/code/src/commands/runnables.ts +++ b/editors/code/src/commands/runnables.ts | |||
@@ -7,7 +7,7 @@ import { startDebugSession, getDebugConfiguration } from '../debug'; | |||
7 | 7 | ||
8 | const quickPickButtons = [{ iconPath: new vscode.ThemeIcon("save"), tooltip: "Save as a launch.json configurtation." }]; | 8 | const quickPickButtons = [{ iconPath: new vscode.ThemeIcon("save"), tooltip: "Save as a launch.json configurtation." }]; |
9 | 9 | ||
10 | async function selectRunnable(ctx: Ctx, prevRunnable?: RunnableQuickPick, showButtons: boolean = true): Promise<RunnableQuickPick | undefined> { | 10 | async function selectRunnable(ctx: Ctx, prevRunnable?: RunnableQuickPick, debuggeeOnly = false, showButtons: boolean = true): Promise<RunnableQuickPick | undefined> { |
11 | const editor = ctx.activeRustEditor; | 11 | const editor = ctx.activeRustEditor; |
12 | const client = ctx.client; | 12 | const client = ctx.client; |
13 | if (!editor || !client) return; | 13 | if (!editor || !client) return; |
@@ -33,9 +33,20 @@ async function selectRunnable(ctx: Ctx, prevRunnable?: RunnableQuickPick, showBu | |||
33 | ) { | 33 | ) { |
34 | continue; | 34 | continue; |
35 | } | 35 | } |
36 | |||
37 | if (debuggeeOnly && (r.label.startsWith('doctest') || r.label.startsWith('cargo'))) { | ||
38 | continue; | ||
39 | } | ||
36 | items.push(new RunnableQuickPick(r)); | 40 | items.push(new RunnableQuickPick(r)); |
37 | } | 41 | } |
38 | 42 | ||
43 | if (items.length === 0) { | ||
44 | // it is the debug case, run always has at least 'cargo check ...' | ||
45 | // see crates\rust-analyzer\src\main_loop\handlers.rs, handle_runnables | ||
46 | vscode.window.showErrorMessage("There's no debug target!"); | ||
47 | return; | ||
48 | } | ||
49 | |||
39 | return await new Promise((resolve) => { | 50 | return await new Promise((resolve) => { |
40 | const disposables: vscode.Disposable[] = []; | 51 | const disposables: vscode.Disposable[] = []; |
41 | const close = (result?: RunnableQuickPick) => { | 52 | const close = (result?: RunnableQuickPick) => { |
@@ -107,7 +118,7 @@ export function debug(ctx: Ctx): Cmd { | |||
107 | let prevDebuggee: RunnableQuickPick | undefined; | 118 | let prevDebuggee: RunnableQuickPick | undefined; |
108 | 119 | ||
109 | return async () => { | 120 | return async () => { |
110 | const item = await selectRunnable(ctx, prevDebuggee); | 121 | const item = await selectRunnable(ctx, prevDebuggee, true); |
111 | if (!item) return; | 122 | if (!item) return; |
112 | 123 | ||
113 | item.detail = 'restart'; | 124 | item.detail = 'restart'; |
@@ -147,7 +158,7 @@ async function makeDebugConfig(ctx: Ctx, item: RunnableQuickPick): Promise<void> | |||
147 | 158 | ||
148 | export function newDebugConfig(ctx: Ctx): Cmd { | 159 | export function newDebugConfig(ctx: Ctx): Cmd { |
149 | return async () => { | 160 | return async () => { |
150 | const item = await selectRunnable(ctx, undefined, false); | 161 | const item = await selectRunnable(ctx, undefined, true, false); |
151 | if (!item) return; | 162 | if (!item) return; |
152 | 163 | ||
153 | await makeDebugConfig(ctx, item); | 164 | await makeDebugConfig(ctx, item); |