diff options
Diffstat (limited to 'editors/code/src/commands')
-rw-r--r-- | editors/code/src/commands/analyzer_status.ts | 51 | ||||
-rw-r--r-- | editors/code/src/commands/expand_macro.ts | 66 | ||||
-rw-r--r-- | editors/code/src/commands/index.ts | 109 | ||||
-rw-r--r-- | editors/code/src/commands/join_lines.ts | 22 | ||||
-rw-r--r-- | editors/code/src/commands/matching_brace.ts | 27 | ||||
-rw-r--r-- | editors/code/src/commands/on_enter.ts | 35 | ||||
-rw-r--r-- | editors/code/src/commands/parent_module.ts | 29 | ||||
-rw-r--r-- | editors/code/src/commands/runnables.ts | 218 | ||||
-rw-r--r-- | editors/code/src/commands/server_version.ts | 15 | ||||
-rw-r--r-- | editors/code/src/commands/ssr.ts | 30 | ||||
-rw-r--r-- | editors/code/src/commands/syntax_tree.ts | 263 |
11 files changed, 0 insertions, 865 deletions
diff --git a/editors/code/src/commands/analyzer_status.ts b/editors/code/src/commands/analyzer_status.ts deleted file mode 100644 index 09daa3402..000000000 --- a/editors/code/src/commands/analyzer_status.ts +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | import * as vscode from 'vscode'; | ||
2 | |||
3 | import * as ra from '../rust-analyzer-api'; | ||
4 | import { Ctx, Cmd } from '../ctx'; | ||
5 | |||
6 | // Shows status of rust-analyzer (for debugging) | ||
7 | export function analyzerStatus(ctx: Ctx): Cmd { | ||
8 | let poller: NodeJS.Timer | undefined = undefined; | ||
9 | const tdcp = new TextDocumentContentProvider(ctx); | ||
10 | |||
11 | ctx.pushCleanup( | ||
12 | vscode.workspace.registerTextDocumentContentProvider( | ||
13 | 'rust-analyzer-status', | ||
14 | tdcp, | ||
15 | ), | ||
16 | ); | ||
17 | |||
18 | ctx.pushCleanup({ | ||
19 | dispose() { | ||
20 | if (poller !== undefined) { | ||
21 | clearInterval(poller); | ||
22 | } | ||
23 | }, | ||
24 | }); | ||
25 | |||
26 | return async () => { | ||
27 | if (poller === undefined) { | ||
28 | poller = setInterval(() => tdcp.eventEmitter.fire(tdcp.uri), 1000); | ||
29 | } | ||
30 | const document = await vscode.workspace.openTextDocument(tdcp.uri); | ||
31 | return vscode.window.showTextDocument(document, vscode.ViewColumn.Two, true); | ||
32 | }; | ||
33 | } | ||
34 | |||
35 | class TextDocumentContentProvider implements vscode.TextDocumentContentProvider { | ||
36 | readonly uri = vscode.Uri.parse('rust-analyzer-status://status'); | ||
37 | readonly eventEmitter = new vscode.EventEmitter<vscode.Uri>(); | ||
38 | |||
39 | constructor(private readonly ctx: Ctx) { | ||
40 | } | ||
41 | |||
42 | provideTextDocumentContent(_uri: vscode.Uri): vscode.ProviderResult<string> { | ||
43 | if (!vscode.window.activeTextEditor) return ''; | ||
44 | |||
45 | return this.ctx.client.sendRequest(ra.analyzerStatus, null); | ||
46 | } | ||
47 | |||
48 | get onDidChange(): vscode.Event<vscode.Uri> { | ||
49 | return this.eventEmitter.event; | ||
50 | } | ||
51 | } | ||
diff --git a/editors/code/src/commands/expand_macro.ts b/editors/code/src/commands/expand_macro.ts deleted file mode 100644 index 23f2ef1d5..000000000 --- a/editors/code/src/commands/expand_macro.ts +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | import * as vscode from 'vscode'; | ||
2 | import * as ra from '../rust-analyzer-api'; | ||
3 | |||
4 | import { Ctx, Cmd } from '../ctx'; | ||
5 | |||
6 | // Opens the virtual file that will show the syntax tree | ||
7 | // | ||
8 | // The contents of the file come from the `TextDocumentContentProvider` | ||
9 | export function expandMacro(ctx: Ctx): Cmd { | ||
10 | const tdcp = new TextDocumentContentProvider(ctx); | ||
11 | ctx.pushCleanup( | ||
12 | vscode.workspace.registerTextDocumentContentProvider( | ||
13 | 'rust-analyzer', | ||
14 | tdcp, | ||
15 | ), | ||
16 | ); | ||
17 | |||
18 | return async () => { | ||
19 | const document = await vscode.workspace.openTextDocument(tdcp.uri); | ||
20 | tdcp.eventEmitter.fire(tdcp.uri); | ||
21 | return vscode.window.showTextDocument( | ||
22 | document, | ||
23 | vscode.ViewColumn.Two, | ||
24 | true, | ||
25 | ); | ||
26 | }; | ||
27 | } | ||
28 | |||
29 | function codeFormat(expanded: ra.ExpandedMacro): string { | ||
30 | let result = `// Recursive expansion of ${expanded.name}! macro\n`; | ||
31 | result += '// ' + '='.repeat(result.length - 3); | ||
32 | result += '\n\n'; | ||
33 | result += expanded.expansion; | ||
34 | |||
35 | return result; | ||
36 | } | ||
37 | |||
38 | class TextDocumentContentProvider | ||
39 | implements vscode.TextDocumentContentProvider { | ||
40 | uri = vscode.Uri.parse('rust-analyzer://expandMacro/[EXPANSION].rs'); | ||
41 | eventEmitter = new vscode.EventEmitter<vscode.Uri>(); | ||
42 | |||
43 | constructor(private readonly ctx: Ctx) { | ||
44 | } | ||
45 | |||
46 | async provideTextDocumentContent(_uri: vscode.Uri): Promise<string> { | ||
47 | const editor = vscode.window.activeTextEditor; | ||
48 | const client = this.ctx.client; | ||
49 | if (!editor || !client) return ''; | ||
50 | |||
51 | const position = editor.selection.active; | ||
52 | |||
53 | const expanded = await client.sendRequest(ra.expandMacro, { | ||
54 | textDocument: { uri: editor.document.uri.toString() }, | ||
55 | position, | ||
56 | }); | ||
57 | |||
58 | if (expanded == null) return 'Not available'; | ||
59 | |||
60 | return codeFormat(expanded); | ||
61 | } | ||
62 | |||
63 | get onDidChange(): vscode.Event<vscode.Uri> { | ||
64 | return this.eventEmitter.event; | ||
65 | } | ||
66 | } | ||
diff --git a/editors/code/src/commands/index.ts b/editors/code/src/commands/index.ts deleted file mode 100644 index e5ed77e32..000000000 --- a/editors/code/src/commands/index.ts +++ /dev/null | |||
@@ -1,109 +0,0 @@ | |||
1 | import * as vscode from 'vscode'; | ||
2 | import * as lc from 'vscode-languageclient'; | ||
3 | import * as ra from '../rust-analyzer-api'; | ||
4 | |||
5 | import { Ctx, Cmd } from '../ctx'; | ||
6 | import * as sourceChange from '../source_change'; | ||
7 | import { assert } from '../util'; | ||
8 | |||
9 | export * from './analyzer_status'; | ||
10 | export * from './matching_brace'; | ||
11 | export * from './join_lines'; | ||
12 | export * from './on_enter'; | ||
13 | export * from './parent_module'; | ||
14 | export * from './syntax_tree'; | ||
15 | export * from './expand_macro'; | ||
16 | export * from './runnables'; | ||
17 | export * from './ssr'; | ||
18 | export * from './server_version'; | ||
19 | |||
20 | export function collectGarbage(ctx: Ctx): Cmd { | ||
21 | return async () => ctx.client.sendRequest(ra.collectGarbage, null); | ||
22 | } | ||
23 | |||
24 | export function showReferences(ctx: Ctx): Cmd { | ||
25 | return (uri: string, position: lc.Position, locations: lc.Location[]) => { | ||
26 | const client = ctx.client; | ||
27 | if (client) { | ||
28 | vscode.commands.executeCommand( | ||
29 | 'editor.action.showReferences', | ||
30 | vscode.Uri.parse(uri), | ||
31 | client.protocol2CodeConverter.asPosition(position), | ||
32 | locations.map(client.protocol2CodeConverter.asLocation), | ||
33 | ); | ||
34 | } | ||
35 | }; | ||
36 | } | ||
37 | |||
38 | export function applySourceChange(ctx: Ctx): Cmd { | ||
39 | return async (change: ra.SourceChange) => { | ||
40 | await sourceChange.applySourceChange(ctx, change); | ||
41 | }; | ||
42 | } | ||
43 | |||
44 | export function selectAndApplySourceChange(ctx: Ctx): Cmd { | ||
45 | return async (changes: ra.SourceChange[]) => { | ||
46 | if (changes.length === 1) { | ||
47 | await sourceChange.applySourceChange(ctx, changes[0]); | ||
48 | } else if (changes.length > 0) { | ||
49 | const selectedChange = await vscode.window.showQuickPick(changes); | ||
50 | if (!selectedChange) return; | ||
51 | await sourceChange.applySourceChange(ctx, selectedChange); | ||
52 | } | ||
53 | }; | ||
54 | } | ||
55 | |||
56 | export function applySnippetWorkspaceEditCommand(_ctx: Ctx): Cmd { | ||
57 | return async (edit: vscode.WorkspaceEdit) => { | ||
58 | await applySnippetWorkspaceEdit(edit); | ||
59 | }; | ||
60 | } | ||
61 | |||
62 | export async function applySnippetWorkspaceEdit(edit: vscode.WorkspaceEdit) { | ||
63 | assert(edit.entries().length === 1, `bad ws edit: ${JSON.stringify(edit)}`); | ||
64 | const [uri, edits] = edit.entries()[0]; | ||
65 | |||
66 | const editor = vscode.window.visibleTextEditors.find((it) => it.document.uri.toString() === uri.toString()); | ||
67 | if (!editor) return; | ||
68 | |||
69 | let selection: vscode.Selection | undefined = undefined; | ||
70 | let lineDelta = 0; | ||
71 | await editor.edit((builder) => { | ||
72 | for (const indel of edits) { | ||
73 | const parsed = parseSnippet(indel.newText); | ||
74 | if (parsed) { | ||
75 | const [newText, [placeholderStart, placeholderLength]] = parsed; | ||
76 | const prefix = newText.substr(0, placeholderStart); | ||
77 | const lastNewline = prefix.lastIndexOf('\n'); | ||
78 | |||
79 | const startLine = indel.range.start.line + lineDelta + countLines(prefix); | ||
80 | const startColumn = lastNewline === -1 ? | ||
81 | indel.range.start.character + placeholderStart | ||
82 | : prefix.length - lastNewline - 1; | ||
83 | const endColumn = startColumn + placeholderLength; | ||
84 | selection = new vscode.Selection( | ||
85 | new vscode.Position(startLine, startColumn), | ||
86 | new vscode.Position(startLine, endColumn), | ||
87 | ); | ||
88 | builder.replace(indel.range, newText); | ||
89 | } else { | ||
90 | lineDelta = countLines(indel.newText) - (indel.range.end.line - indel.range.start.line); | ||
91 | builder.replace(indel.range, indel.newText); | ||
92 | } | ||
93 | } | ||
94 | }); | ||
95 | if (selection) editor.selection = selection; | ||
96 | } | ||
97 | |||
98 | function parseSnippet(snip: string): [string, [number, number]] | undefined { | ||
99 | const m = snip.match(/\$(0|\{0:([^}]*)\})/); | ||
100 | if (!m) return undefined; | ||
101 | const placeholder = m[2] ?? ""; | ||
102 | const range: [number, number] = [m.index!!, placeholder.length]; | ||
103 | const insert = snip.replace(m[0], placeholder); | ||
104 | return [insert, range]; | ||
105 | } | ||
106 | |||
107 | function countLines(text: string): number { | ||
108 | return (text.match(/\n/g) || []).length; | ||
109 | } | ||
diff --git a/editors/code/src/commands/join_lines.ts b/editors/code/src/commands/join_lines.ts deleted file mode 100644 index 0bf1ee6e6..000000000 --- a/editors/code/src/commands/join_lines.ts +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | import * as ra from '../rust-analyzer-api'; | ||
2 | import * as lc from 'vscode-languageclient'; | ||
3 | |||
4 | import { Ctx, Cmd } from '../ctx'; | ||
5 | |||
6 | export function joinLines(ctx: Ctx): Cmd { | ||
7 | return async () => { | ||
8 | const editor = ctx.activeRustEditor; | ||
9 | const client = ctx.client; | ||
10 | if (!editor || !client) return; | ||
11 | |||
12 | const items: lc.TextEdit[] = await client.sendRequest(ra.joinLines, { | ||
13 | ranges: editor.selections.map((it) => client.code2ProtocolConverter.asRange(it)), | ||
14 | textDocument: { uri: editor.document.uri.toString() }, | ||
15 | }); | ||
16 | editor.edit((builder) => { | ||
17 | client.protocol2CodeConverter.asTextEdits(items).forEach((edit) => { | ||
18 | builder.replace(edit.range, edit.newText); | ||
19 | }); | ||
20 | }); | ||
21 | }; | ||
22 | } | ||
diff --git a/editors/code/src/commands/matching_brace.ts b/editors/code/src/commands/matching_brace.ts deleted file mode 100644 index a60776e2d..000000000 --- a/editors/code/src/commands/matching_brace.ts +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | import * as vscode from 'vscode'; | ||
2 | import * as ra from '../rust-analyzer-api'; | ||
3 | |||
4 | import { Ctx, Cmd } from '../ctx'; | ||
5 | |||
6 | export function matchingBrace(ctx: Ctx): Cmd { | ||
7 | return async () => { | ||
8 | const editor = ctx.activeRustEditor; | ||
9 | const client = ctx.client; | ||
10 | if (!editor || !client) return; | ||
11 | |||
12 | const response = await client.sendRequest(ra.findMatchingBrace, { | ||
13 | textDocument: { uri: editor.document.uri.toString() }, | ||
14 | offsets: editor.selections.map(s => | ||
15 | client.code2ProtocolConverter.asPosition(s.active), | ||
16 | ), | ||
17 | }); | ||
18 | editor.selections = editor.selections.map((sel, idx) => { | ||
19 | const active = client.protocol2CodeConverter.asPosition( | ||
20 | response[idx], | ||
21 | ); | ||
22 | const anchor = sel.isEmpty ? active : sel.anchor; | ||
23 | return new vscode.Selection(anchor, active); | ||
24 | }); | ||
25 | editor.revealRange(editor.selection); | ||
26 | }; | ||
27 | } | ||
diff --git a/editors/code/src/commands/on_enter.ts b/editors/code/src/commands/on_enter.ts deleted file mode 100644 index a7871c31e..000000000 --- a/editors/code/src/commands/on_enter.ts +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | import * as vscode from 'vscode'; | ||
2 | import * as ra from '../rust-analyzer-api'; | ||
3 | |||
4 | import { Cmd, Ctx } from '../ctx'; | ||
5 | import { applySnippetWorkspaceEdit } from '.'; | ||
6 | |||
7 | async function handleKeypress(ctx: Ctx) { | ||
8 | const editor = ctx.activeRustEditor; | ||
9 | const client = ctx.client; | ||
10 | |||
11 | if (!editor || !client) return false; | ||
12 | |||
13 | const change = await client.sendRequest(ra.onEnter, { | ||
14 | textDocument: { uri: editor.document.uri.toString() }, | ||
15 | position: client.code2ProtocolConverter.asPosition( | ||
16 | editor.selection.active, | ||
17 | ), | ||
18 | }).catch(_error => { | ||
19 | // client.logFailedRequest(OnEnterRequest.type, error); | ||
20 | return null; | ||
21 | }); | ||
22 | if (!change) return false; | ||
23 | |||
24 | const workspaceEdit = client.protocol2CodeConverter.asWorkspaceEdit(change); | ||
25 | await applySnippetWorkspaceEdit(workspaceEdit); | ||
26 | return true; | ||
27 | } | ||
28 | |||
29 | export function onEnter(ctx: Ctx): Cmd { | ||
30 | return async () => { | ||
31 | if (await handleKeypress(ctx)) return; | ||
32 | |||
33 | await vscode.commands.executeCommand('default:type', { text: '\n' }); | ||
34 | }; | ||
35 | } | ||
diff --git a/editors/code/src/commands/parent_module.ts b/editors/code/src/commands/parent_module.ts deleted file mode 100644 index 8f78ddd71..000000000 --- a/editors/code/src/commands/parent_module.ts +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | import * as vscode from 'vscode'; | ||
2 | import * as ra from '../rust-analyzer-api'; | ||
3 | |||
4 | import { Ctx, Cmd } from '../ctx'; | ||
5 | |||
6 | export function parentModule(ctx: Ctx): Cmd { | ||
7 | return async () => { | ||
8 | const editor = ctx.activeRustEditor; | ||
9 | const client = ctx.client; | ||
10 | if (!editor || !client) return; | ||
11 | |||
12 | const response = await client.sendRequest(ra.parentModule, { | ||
13 | textDocument: { uri: editor.document.uri.toString() }, | ||
14 | position: client.code2ProtocolConverter.asPosition( | ||
15 | editor.selection.active, | ||
16 | ), | ||
17 | }); | ||
18 | const loc = response[0]; | ||
19 | if (loc == null) return; | ||
20 | |||
21 | const uri = client.protocol2CodeConverter.asUri(loc.uri); | ||
22 | const range = client.protocol2CodeConverter.asRange(loc.range); | ||
23 | |||
24 | const doc = await vscode.workspace.openTextDocument(uri); | ||
25 | const e = await vscode.window.showTextDocument(doc); | ||
26 | e.selection = new vscode.Selection(range.start, range.start); | ||
27 | e.revealRange(range, vscode.TextEditorRevealType.InCenter); | ||
28 | }; | ||
29 | } | ||
diff --git a/editors/code/src/commands/runnables.ts b/editors/code/src/commands/runnables.ts deleted file mode 100644 index 0bd30fb07..000000000 --- a/editors/code/src/commands/runnables.ts +++ /dev/null | |||
@@ -1,218 +0,0 @@ | |||
1 | import * as vscode from 'vscode'; | ||
2 | import * as lc from 'vscode-languageclient'; | ||
3 | import * as ra from '../rust-analyzer-api'; | ||
4 | |||
5 | import { Ctx, Cmd } from '../ctx'; | ||
6 | import { startDebugSession, getDebugConfiguration } from '../debug'; | ||
7 | |||
8 | const quickPickButtons = [{ iconPath: new vscode.ThemeIcon("save"), tooltip: "Save as a launch.json configurtation." }]; | ||
9 | |||
10 | async function selectRunnable(ctx: Ctx, prevRunnable?: RunnableQuickPick, debuggeeOnly = false, showButtons: boolean = true): Promise<RunnableQuickPick | undefined> { | ||
11 | const editor = ctx.activeRustEditor; | ||
12 | const client = ctx.client; | ||
13 | if (!editor || !client) return; | ||
14 | |||
15 | const textDocument: lc.TextDocumentIdentifier = { | ||
16 | uri: editor.document.uri.toString(), | ||
17 | }; | ||
18 | |||
19 | const runnables = await client.sendRequest(ra.runnables, { | ||
20 | textDocument, | ||
21 | position: client.code2ProtocolConverter.asPosition( | ||
22 | editor.selection.active, | ||
23 | ), | ||
24 | }); | ||
25 | const items: RunnableQuickPick[] = []; | ||
26 | if (prevRunnable) { | ||
27 | items.push(prevRunnable); | ||
28 | } | ||
29 | for (const r of runnables) { | ||
30 | if ( | ||
31 | prevRunnable && | ||
32 | JSON.stringify(prevRunnable.runnable) === JSON.stringify(r) | ||
33 | ) { | ||
34 | continue; | ||
35 | } | ||
36 | |||
37 | if (debuggeeOnly && (r.label.startsWith('doctest') || r.label.startsWith('cargo'))) { | ||
38 | continue; | ||
39 | } | ||
40 | items.push(new RunnableQuickPick(r)); | ||
41 | } | ||
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 | |||
50 | return await new Promise((resolve) => { | ||
51 | const disposables: vscode.Disposable[] = []; | ||
52 | const close = (result?: RunnableQuickPick) => { | ||
53 | resolve(result); | ||
54 | disposables.forEach(d => d.dispose()); | ||
55 | }; | ||
56 | |||
57 | const quickPick = vscode.window.createQuickPick<RunnableQuickPick>(); | ||
58 | quickPick.items = items; | ||
59 | quickPick.title = "Select Runnable"; | ||
60 | if (showButtons) { | ||
61 | quickPick.buttons = quickPickButtons; | ||
62 | } | ||
63 | disposables.push( | ||
64 | quickPick.onDidHide(() => close()), | ||
65 | quickPick.onDidAccept(() => close(quickPick.selectedItems[0])), | ||
66 | quickPick.onDidTriggerButton((_button) => { | ||
67 | (async () => await makeDebugConfig(ctx, quickPick.activeItems[0]))(); | ||
68 | close(); | ||
69 | }), | ||
70 | quickPick.onDidChangeActive((active) => { | ||
71 | if (showButtons && active.length > 0) { | ||
72 | if (active[0].label.startsWith('cargo')) { | ||
73 | // save button makes no sense for `cargo test` or `cargo check` | ||
74 | quickPick.buttons = []; | ||
75 | } else if (quickPick.buttons.length === 0) { | ||
76 | quickPick.buttons = quickPickButtons; | ||
77 | } | ||
78 | } | ||
79 | }), | ||
80 | quickPick | ||
81 | ); | ||
82 | quickPick.show(); | ||
83 | }); | ||
84 | } | ||
85 | |||
86 | export function run(ctx: Ctx): Cmd { | ||
87 | let prevRunnable: RunnableQuickPick | undefined; | ||
88 | |||
89 | return async () => { | ||
90 | const item = await selectRunnable(ctx, prevRunnable); | ||
91 | if (!item) return; | ||
92 | |||
93 | item.detail = 'rerun'; | ||
94 | prevRunnable = item; | ||
95 | const task = createTask(item.runnable); | ||
96 | return await vscode.tasks.executeTask(task); | ||
97 | }; | ||
98 | } | ||
99 | |||
100 | export function runSingle(ctx: Ctx): Cmd { | ||
101 | return async (runnable: ra.Runnable) => { | ||
102 | const editor = ctx.activeRustEditor; | ||
103 | if (!editor) return; | ||
104 | |||
105 | const task = createTask(runnable); | ||
106 | task.group = vscode.TaskGroup.Build; | ||
107 | task.presentationOptions = { | ||
108 | reveal: vscode.TaskRevealKind.Always, | ||
109 | panel: vscode.TaskPanelKind.Dedicated, | ||
110 | clear: true, | ||
111 | }; | ||
112 | |||
113 | return vscode.tasks.executeTask(task); | ||
114 | }; | ||
115 | } | ||
116 | |||
117 | export function debug(ctx: Ctx): Cmd { | ||
118 | let prevDebuggee: RunnableQuickPick | undefined; | ||
119 | |||
120 | return async () => { | ||
121 | const item = await selectRunnable(ctx, prevDebuggee, true); | ||
122 | if (!item) return; | ||
123 | |||
124 | item.detail = 'restart'; | ||
125 | prevDebuggee = item; | ||
126 | return await startDebugSession(ctx, item.runnable); | ||
127 | }; | ||
128 | } | ||
129 | |||
130 | export function debugSingle(ctx: Ctx): Cmd { | ||
131 | return async (config: ra.Runnable) => { | ||
132 | await startDebugSession(ctx, config); | ||
133 | }; | ||
134 | } | ||
135 | |||
136 | async function makeDebugConfig(ctx: Ctx, item: RunnableQuickPick): Promise<void> { | ||
137 | const scope = ctx.activeRustEditor?.document.uri; | ||
138 | if (!scope) return; | ||
139 | |||
140 | const debugConfig = await getDebugConfiguration(ctx, item.runnable); | ||
141 | if (!debugConfig) return; | ||
142 | |||
143 | const wsLaunchSection = vscode.workspace.getConfiguration("launch", scope); | ||
144 | const configurations = wsLaunchSection.get<any[]>("configurations") || []; | ||
145 | |||
146 | const index = configurations.findIndex(c => c.name === debugConfig.name); | ||
147 | if (index !== -1) { | ||
148 | const answer = await vscode.window.showErrorMessage(`Launch configuration '${debugConfig.name}' already exists!`, 'Cancel', 'Update'); | ||
149 | if (answer === "Cancel") return; | ||
150 | |||
151 | configurations[index] = debugConfig; | ||
152 | } else { | ||
153 | configurations.push(debugConfig); | ||
154 | } | ||
155 | |||
156 | await wsLaunchSection.update("configurations", configurations); | ||
157 | } | ||
158 | |||
159 | export function newDebugConfig(ctx: Ctx): Cmd { | ||
160 | return async () => { | ||
161 | const item = await selectRunnable(ctx, undefined, true, false); | ||
162 | if (!item) return; | ||
163 | |||
164 | await makeDebugConfig(ctx, item); | ||
165 | }; | ||
166 | } | ||
167 | |||
168 | class RunnableQuickPick implements vscode.QuickPickItem { | ||
169 | public label: string; | ||
170 | public description?: string | undefined; | ||
171 | public detail?: string | undefined; | ||
172 | public picked?: boolean | undefined; | ||
173 | |||
174 | constructor(public runnable: ra.Runnable) { | ||
175 | this.label = runnable.label; | ||
176 | } | ||
177 | } | ||
178 | |||
179 | interface CargoTaskDefinition extends vscode.TaskDefinition { | ||
180 | type: 'cargo'; | ||
181 | label: string; | ||
182 | command: string; | ||
183 | args: string[]; | ||
184 | env?: { [key: string]: string }; | ||
185 | } | ||
186 | |||
187 | function createTask(spec: ra.Runnable): vscode.Task { | ||
188 | const TASK_SOURCE = 'Rust'; | ||
189 | const definition: CargoTaskDefinition = { | ||
190 | type: 'cargo', | ||
191 | label: spec.label, | ||
192 | command: spec.bin, | ||
193 | args: spec.extraArgs ? [...spec.args, '--', ...spec.extraArgs] : spec.args, | ||
194 | env: spec.env, | ||
195 | }; | ||
196 | |||
197 | const execOption: vscode.ShellExecutionOptions = { | ||
198 | cwd: spec.cwd || '.', | ||
199 | env: definition.env, | ||
200 | }; | ||
201 | const exec = new vscode.ShellExecution( | ||
202 | definition.command, | ||
203 | definition.args, | ||
204 | execOption, | ||
205 | ); | ||
206 | |||
207 | const f = vscode.workspace.workspaceFolders![0]; | ||
208 | const t = new vscode.Task( | ||
209 | definition, | ||
210 | f, | ||
211 | definition.label, | ||
212 | TASK_SOURCE, | ||
213 | exec, | ||
214 | ['$rustc'], | ||
215 | ); | ||
216 | t.presentationOptions.clear = true; | ||
217 | return t; | ||
218 | } | ||
diff --git a/editors/code/src/commands/server_version.ts b/editors/code/src/commands/server_version.ts deleted file mode 100644 index d64ac726e..000000000 --- a/editors/code/src/commands/server_version.ts +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | import * as vscode from "vscode"; | ||
2 | import { spawnSync } from "child_process"; | ||
3 | import { Ctx, Cmd } from '../ctx'; | ||
4 | |||
5 | export function serverVersion(ctx: Ctx): Cmd { | ||
6 | return async () => { | ||
7 | const { stdout } = spawnSync(ctx.serverPath, ["--version"], { encoding: "utf8" }); | ||
8 | const commitHash = stdout.slice(`rust-analyzer `.length).trim(); | ||
9 | const { releaseTag } = ctx.config.package; | ||
10 | |||
11 | void vscode.window.showInformationMessage( | ||
12 | `rust-analyzer version: ${releaseTag ?? "unreleased"} (${commitHash})` | ||
13 | ); | ||
14 | }; | ||
15 | } | ||
diff --git a/editors/code/src/commands/ssr.ts b/editors/code/src/commands/ssr.ts deleted file mode 100644 index 5d40a64d2..000000000 --- a/editors/code/src/commands/ssr.ts +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | import * as vscode from 'vscode'; | ||
2 | import * as ra from "../rust-analyzer-api"; | ||
3 | |||
4 | import { Ctx, Cmd } from '../ctx'; | ||
5 | |||
6 | export function ssr(ctx: Ctx): Cmd { | ||
7 | return async () => { | ||
8 | const client = ctx.client; | ||
9 | if (!client) return; | ||
10 | |||
11 | const options: vscode.InputBoxOptions = { | ||
12 | value: "() ==>> ()", | ||
13 | prompt: "Enter request, for example 'Foo($a:expr) ==> Foo::new($a)' ", | ||
14 | validateInput: async (x: string) => { | ||
15 | try { | ||
16 | await client.sendRequest(ra.ssr, { query: x, parseOnly: true }); | ||
17 | } catch (e) { | ||
18 | return e.toString(); | ||
19 | } | ||
20 | return null; | ||
21 | } | ||
22 | }; | ||
23 | const request = await vscode.window.showInputBox(options); | ||
24 | if (!request) return; | ||
25 | |||
26 | const edit = await client.sendRequest(ra.ssr, { query: request, parseOnly: false }); | ||
27 | |||
28 | await vscode.workspace.applyEdit(client.protocol2CodeConverter.asWorkspaceEdit(edit)); | ||
29 | }; | ||
30 | } | ||
diff --git a/editors/code/src/commands/syntax_tree.ts b/editors/code/src/commands/syntax_tree.ts deleted file mode 100644 index a5446c327..000000000 --- a/editors/code/src/commands/syntax_tree.ts +++ /dev/null | |||
@@ -1,263 +0,0 @@ | |||
1 | import * as vscode from 'vscode'; | ||
2 | import * as ra from '../rust-analyzer-api'; | ||
3 | |||
4 | import { Ctx, Cmd, Disposable } from '../ctx'; | ||
5 | import { isRustDocument, RustEditor, isRustEditor, sleep } from '../util'; | ||
6 | |||
7 | const AST_FILE_SCHEME = "rust-analyzer"; | ||
8 | |||
9 | // Opens the virtual file that will show the syntax tree | ||
10 | // | ||
11 | // The contents of the file come from the `TextDocumentContentProvider` | ||
12 | export function syntaxTree(ctx: Ctx): Cmd { | ||
13 | const tdcp = new TextDocumentContentProvider(ctx); | ||
14 | |||
15 | void new AstInspector(ctx); | ||
16 | |||
17 | ctx.pushCleanup(vscode.workspace.registerTextDocumentContentProvider(AST_FILE_SCHEME, tdcp)); | ||
18 | ctx.pushCleanup(vscode.languages.setLanguageConfiguration("ra_syntax_tree", { | ||
19 | brackets: [["[", ")"]], | ||
20 | })); | ||
21 | |||
22 | return async () => { | ||
23 | const editor = vscode.window.activeTextEditor; | ||
24 | const rangeEnabled = !!editor && !editor.selection.isEmpty; | ||
25 | |||
26 | const uri = rangeEnabled | ||
27 | ? vscode.Uri.parse(`${tdcp.uri.toString()}?range=true`) | ||
28 | : tdcp.uri; | ||
29 | |||
30 | const document = await vscode.workspace.openTextDocument(uri); | ||
31 | |||
32 | tdcp.eventEmitter.fire(uri); | ||
33 | |||
34 | void await vscode.window.showTextDocument(document, { | ||
35 | viewColumn: vscode.ViewColumn.Two, | ||
36 | preserveFocus: true | ||
37 | }); | ||
38 | }; | ||
39 | } | ||
40 | |||
41 | class TextDocumentContentProvider implements vscode.TextDocumentContentProvider { | ||
42 | readonly uri = vscode.Uri.parse('rust-analyzer://syntaxtree/tree.rast'); | ||
43 | readonly eventEmitter = new vscode.EventEmitter<vscode.Uri>(); | ||
44 | |||
45 | |||
46 | constructor(private readonly ctx: Ctx) { | ||
47 | vscode.workspace.onDidChangeTextDocument(this.onDidChangeTextDocument, this, ctx.subscriptions); | ||
48 | vscode.window.onDidChangeActiveTextEditor(this.onDidChangeActiveTextEditor, this, ctx.subscriptions); | ||
49 | } | ||
50 | |||
51 | private onDidChangeTextDocument(event: vscode.TextDocumentChangeEvent) { | ||
52 | if (isRustDocument(event.document)) { | ||
53 | // We need to order this after language server updates, but there's no API for that. | ||
54 | // Hence, good old sleep(). | ||
55 | void sleep(10).then(() => this.eventEmitter.fire(this.uri)); | ||
56 | } | ||
57 | } | ||
58 | private onDidChangeActiveTextEditor(editor: vscode.TextEditor | undefined) { | ||
59 | if (editor && isRustEditor(editor)) { | ||
60 | this.eventEmitter.fire(this.uri); | ||
61 | } | ||
62 | } | ||
63 | |||
64 | provideTextDocumentContent(uri: vscode.Uri, ct: vscode.CancellationToken): vscode.ProviderResult<string> { | ||
65 | const rustEditor = this.ctx.activeRustEditor; | ||
66 | if (!rustEditor) return ''; | ||
67 | |||
68 | // When the range based query is enabled we take the range of the selection | ||
69 | const range = uri.query === 'range=true' && !rustEditor.selection.isEmpty | ||
70 | ? this.ctx.client.code2ProtocolConverter.asRange(rustEditor.selection) | ||
71 | : null; | ||
72 | |||
73 | const params = { textDocument: { uri: rustEditor.document.uri.toString() }, range, }; | ||
74 | return this.ctx.client.sendRequest(ra.syntaxTree, params, ct); | ||
75 | } | ||
76 | |||
77 | get onDidChange(): vscode.Event<vscode.Uri> { | ||
78 | return this.eventEmitter.event; | ||
79 | } | ||
80 | } | ||
81 | |||
82 | |||
83 | // FIXME: consider implementing this via the Tree View API? | ||
84 | // https://code.visualstudio.com/api/extension-guides/tree-view | ||
85 | class AstInspector implements vscode.HoverProvider, vscode.DefinitionProvider, Disposable { | ||
86 | private readonly astDecorationType = vscode.window.createTextEditorDecorationType({ | ||
87 | borderColor: new vscode.ThemeColor('rust_analyzer.syntaxTreeBorder'), | ||
88 | borderStyle: "solid", | ||
89 | borderWidth: "2px", | ||
90 | |||
91 | }); | ||
92 | private rustEditor: undefined | RustEditor; | ||
93 | |||
94 | // Lazy rust token range -> syntax tree file range. | ||
95 | private readonly rust2Ast = new Lazy(() => { | ||
96 | const astEditor = this.findAstTextEditor(); | ||
97 | if (!this.rustEditor || !astEditor) return undefined; | ||
98 | |||
99 | const buf: [vscode.Range, vscode.Range][] = []; | ||
100 | for (let i = 0; i < astEditor.document.lineCount; ++i) { | ||
101 | const astLine = astEditor.document.lineAt(i); | ||
102 | |||
103 | // Heuristically look for nodes with quoted text (which are token nodes) | ||
104 | const isTokenNode = astLine.text.lastIndexOf('"') >= 0; | ||
105 | if (!isTokenNode) continue; | ||
106 | |||
107 | const rustRange = this.parseRustTextRange(this.rustEditor.document, astLine.text); | ||
108 | if (!rustRange) continue; | ||
109 | |||
110 | buf.push([rustRange, this.findAstNodeRange(astLine)]); | ||
111 | } | ||
112 | return buf; | ||
113 | }); | ||
114 | |||
115 | constructor(ctx: Ctx) { | ||
116 | ctx.pushCleanup(vscode.languages.registerHoverProvider({ scheme: AST_FILE_SCHEME }, this)); | ||
117 | ctx.pushCleanup(vscode.languages.registerDefinitionProvider({ language: "rust" }, this)); | ||
118 | vscode.workspace.onDidCloseTextDocument(this.onDidCloseTextDocument, this, ctx.subscriptions); | ||
119 | vscode.workspace.onDidChangeTextDocument(this.onDidChangeTextDocument, this, ctx.subscriptions); | ||
120 | vscode.window.onDidChangeVisibleTextEditors(this.onDidChangeVisibleTextEditors, this, ctx.subscriptions); | ||
121 | |||
122 | ctx.pushCleanup(this); | ||
123 | } | ||
124 | dispose() { | ||
125 | this.setRustEditor(undefined); | ||
126 | } | ||
127 | |||
128 | private onDidChangeTextDocument(event: vscode.TextDocumentChangeEvent) { | ||
129 | if (this.rustEditor && event.document.uri.toString() === this.rustEditor.document.uri.toString()) { | ||
130 | this.rust2Ast.reset(); | ||
131 | } | ||
132 | } | ||
133 | |||
134 | private onDidCloseTextDocument(doc: vscode.TextDocument) { | ||
135 | if (this.rustEditor && doc.uri.toString() === this.rustEditor.document.uri.toString()) { | ||
136 | this.setRustEditor(undefined); | ||
137 | } | ||
138 | } | ||
139 | |||
140 | private onDidChangeVisibleTextEditors(editors: vscode.TextEditor[]) { | ||
141 | if (!this.findAstTextEditor()) { | ||
142 | this.setRustEditor(undefined); | ||
143 | return; | ||
144 | } | ||
145 | this.setRustEditor(editors.find(isRustEditor)); | ||
146 | } | ||
147 | |||
148 | private findAstTextEditor(): undefined | vscode.TextEditor { | ||
149 | return vscode.window.visibleTextEditors.find(it => it.document.uri.scheme === AST_FILE_SCHEME); | ||
150 | } | ||
151 | |||
152 | private setRustEditor(newRustEditor: undefined | RustEditor) { | ||
153 | if (this.rustEditor && this.rustEditor !== newRustEditor) { | ||
154 | this.rustEditor.setDecorations(this.astDecorationType, []); | ||
155 | this.rust2Ast.reset(); | ||
156 | } | ||
157 | this.rustEditor = newRustEditor; | ||
158 | } | ||
159 | |||
160 | // additional positional params are omitted | ||
161 | provideDefinition(doc: vscode.TextDocument, pos: vscode.Position): vscode.ProviderResult<vscode.DefinitionLink[]> { | ||
162 | if (!this.rustEditor || doc.uri.toString() !== this.rustEditor.document.uri.toString()) return; | ||
163 | |||
164 | const astEditor = this.findAstTextEditor(); | ||
165 | if (!astEditor) return; | ||
166 | |||
167 | const rust2AstRanges = this.rust2Ast.get()?.find(([rustRange, _]) => rustRange.contains(pos)); | ||
168 | if (!rust2AstRanges) return; | ||
169 | |||
170 | const [rustFileRange, astFileRange] = rust2AstRanges; | ||
171 | |||
172 | astEditor.revealRange(astFileRange); | ||
173 | astEditor.selection = new vscode.Selection(astFileRange.start, astFileRange.end); | ||
174 | |||
175 | return [{ | ||
176 | targetRange: astFileRange, | ||
177 | targetUri: astEditor.document.uri, | ||
178 | originSelectionRange: rustFileRange, | ||
179 | targetSelectionRange: astFileRange, | ||
180 | }]; | ||
181 | } | ||
182 | |||
183 | // additional positional params are omitted | ||
184 | provideHover(doc: vscode.TextDocument, hoverPosition: vscode.Position): vscode.ProviderResult<vscode.Hover> { | ||
185 | if (!this.rustEditor) return; | ||
186 | |||
187 | const astFileLine = doc.lineAt(hoverPosition.line); | ||
188 | |||
189 | const rustFileRange = this.parseRustTextRange(this.rustEditor.document, astFileLine.text); | ||
190 | if (!rustFileRange) return; | ||
191 | |||
192 | this.rustEditor.setDecorations(this.astDecorationType, [rustFileRange]); | ||
193 | this.rustEditor.revealRange(rustFileRange); | ||
194 | |||
195 | const rustSourceCode = this.rustEditor.document.getText(rustFileRange); | ||
196 | const astFileRange = this.findAstNodeRange(astFileLine); | ||
197 | |||
198 | return new vscode.Hover(["```rust\n" + rustSourceCode + "\n```"], astFileRange); | ||
199 | } | ||
200 | |||
201 | private findAstNodeRange(astLine: vscode.TextLine): vscode.Range { | ||
202 | const lineOffset = astLine.range.start; | ||
203 | const begin = lineOffset.translate(undefined, astLine.firstNonWhitespaceCharacterIndex); | ||
204 | const end = lineOffset.translate(undefined, astLine.text.trimEnd().length); | ||
205 | return new vscode.Range(begin, end); | ||
206 | } | ||
207 | |||
208 | private parseRustTextRange(doc: vscode.TextDocument, astLine: string): undefined | vscode.Range { | ||
209 | const parsedRange = /(\d+)\.\.(\d+)/.exec(astLine); | ||
210 | if (!parsedRange) return; | ||
211 | |||
212 | const [begin, end] = parsedRange | ||
213 | .slice(1) | ||
214 | .map(off => this.positionAt(doc, +off)); | ||
215 | |||
216 | return new vscode.Range(begin, end); | ||
217 | } | ||
218 | |||
219 | // Memoize the last value, otherwise the CPU is at 100% single core | ||
220 | // with quadratic lookups when we build rust2Ast cache | ||
221 | cache?: { doc: vscode.TextDocument; offset: number; line: number }; | ||
222 | |||
223 | positionAt(doc: vscode.TextDocument, targetOffset: number): vscode.Position { | ||
224 | if (doc.eol === vscode.EndOfLine.LF) { | ||
225 | return doc.positionAt(targetOffset); | ||
226 | } | ||
227 | |||
228 | // Dirty workaround for crlf line endings | ||
229 | // We are still in this prehistoric era of carriage returns here... | ||
230 | |||
231 | let line = 0; | ||
232 | let offset = 0; | ||
233 | |||
234 | const cache = this.cache; | ||
235 | if (cache?.doc === doc && cache.offset <= targetOffset) { | ||
236 | ({ line, offset } = cache); | ||
237 | } | ||
238 | |||
239 | while (true) { | ||
240 | const lineLenWithLf = doc.lineAt(line).text.length + 1; | ||
241 | if (offset + lineLenWithLf > targetOffset) { | ||
242 | this.cache = { doc, offset, line }; | ||
243 | return doc.positionAt(targetOffset + line); | ||
244 | } | ||
245 | offset += lineLenWithLf; | ||
246 | line += 1; | ||
247 | } | ||
248 | } | ||
249 | } | ||
250 | |||
251 | class Lazy<T> { | ||
252 | val: undefined | T; | ||
253 | |||
254 | constructor(private readonly compute: () => undefined | T) { } | ||
255 | |||
256 | get() { | ||
257 | return this.val ?? (this.val = this.compute()); | ||
258 | } | ||
259 | |||
260 | reset() { | ||
261 | this.val = undefined; | ||
262 | } | ||
263 | } | ||