diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-30 18:36:34 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-30 18:36:34 +0000 |
commit | 237abb85c40672e8cdafa423db6187c107369a09 (patch) | |
tree | 7c1c6f94918bbb4343f0a2122c8989978ff5b9ac /editors/code/src/commands | |
parent | 7c1634a9c2d76ea8c152c368775391090d62db8f (diff) | |
parent | 94be27fc44763afbf67d36010d4aa05639191e4b (diff) |
Merge #2692
2692: Move expand macro to the new context r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors/code/src/commands')
-rw-r--r-- | editors/code/src/commands/analyzer_status.ts | 4 | ||||
-rw-r--r-- | editors/code/src/commands/expand_macro.ts | 102 | ||||
-rw-r--r-- | editors/code/src/commands/index.ts | 2 | ||||
-rw-r--r-- | editors/code/src/commands/syntax_tree.ts | 19 |
4 files changed, 59 insertions, 68 deletions
diff --git a/editors/code/src/commands/analyzer_status.ts b/editors/code/src/commands/analyzer_status.ts index b2b624b75..2c8362286 100644 --- a/editors/code/src/commands/analyzer_status.ts +++ b/editors/code/src/commands/analyzer_status.ts | |||
@@ -1,8 +1,8 @@ | |||
1 | import * as vscode from 'vscode'; | 1 | import * as vscode from 'vscode'; |
2 | 2 | ||
3 | import { Ctx, Cmd } from '../ctx'; | 3 | import { Ctx, Cmd } from '../ctx'; |
4 | // Shows status of rust-analyzer (for debugging) | ||
5 | 4 | ||
5 | // Shows status of rust-analyzer (for debugging) | ||
6 | export function analyzerStatus(ctx: Ctx): Cmd { | 6 | export function analyzerStatus(ctx: Ctx): Cmd { |
7 | let poller: NodeJS.Timer | null = null; | 7 | let poller: NodeJS.Timer | null = null; |
8 | const tdcp = new TextDocumentContentProvider(ctx); | 8 | const tdcp = new TextDocumentContentProvider(ctx); |
@@ -37,7 +37,7 @@ export function analyzerStatus(ctx: Ctx): Cmd { | |||
37 | 37 | ||
38 | class TextDocumentContentProvider | 38 | class TextDocumentContentProvider |
39 | implements vscode.TextDocumentContentProvider { | 39 | implements vscode.TextDocumentContentProvider { |
40 | ctx: Ctx; | 40 | private ctx: Ctx; |
41 | uri = vscode.Uri.parse('rust-analyzer-status://status'); | 41 | uri = vscode.Uri.parse('rust-analyzer-status://status'); |
42 | eventEmitter = new vscode.EventEmitter<vscode.Uri>(); | 42 | eventEmitter = new vscode.EventEmitter<vscode.Uri>(); |
43 | 43 | ||
diff --git a/editors/code/src/commands/expand_macro.ts b/editors/code/src/commands/expand_macro.ts index 17c78280a..da208257a 100644 --- a/editors/code/src/commands/expand_macro.ts +++ b/editors/code/src/commands/expand_macro.ts | |||
@@ -1,60 +1,23 @@ | |||
1 | import * as vscode from 'vscode'; | 1 | import * as vscode from 'vscode'; |
2 | import { Position, TextDocumentIdentifier } from 'vscode-languageclient'; | 2 | import * as lc from 'vscode-languageclient'; |
3 | import { Server } from '../server'; | ||
4 | 3 | ||
5 | export const expandMacroUri = vscode.Uri.parse( | 4 | import { Ctx, Cmd } from '../ctx'; |
6 | 'rust-analyzer://expandMacro/[EXPANSION].rs', | ||
7 | ); | ||
8 | |||
9 | export class ExpandMacroContentProvider | ||
10 | implements vscode.TextDocumentContentProvider { | ||
11 | public eventEmitter = new vscode.EventEmitter<vscode.Uri>(); | ||
12 | |||
13 | public provideTextDocumentContent( | ||
14 | _uri: vscode.Uri, | ||
15 | ): vscode.ProviderResult<string> { | ||
16 | async function handle() { | ||
17 | const editor = vscode.window.activeTextEditor; | ||
18 | if (editor == null) { | ||
19 | return ''; | ||
20 | } | ||
21 | |||
22 | const position = editor.selection.active; | ||
23 | const request: MacroExpandParams = { | ||
24 | textDocument: { uri: editor.document.uri.toString() }, | ||
25 | position, | ||
26 | }; | ||
27 | const expanded = await Server.client.sendRequest<ExpandedMacro>( | ||
28 | 'rust-analyzer/expandMacro', | ||
29 | request, | ||
30 | ); | ||
31 | |||
32 | if (expanded == null) { | ||
33 | return 'Not available'; | ||
34 | } | ||
35 | |||
36 | return code_format(expanded); | ||
37 | } | ||
38 | |||
39 | return handle(); | ||
40 | } | ||
41 | |||
42 | get onDidChange(): vscode.Event<vscode.Uri> { | ||
43 | return this.eventEmitter.event; | ||
44 | } | ||
45 | } | ||
46 | 5 | ||
47 | // Opens the virtual file that will show the syntax tree | 6 | // Opens the virtual file that will show the syntax tree |
48 | // | 7 | // |
49 | // The contents of the file come from the `TextDocumentContentProvider` | 8 | // The contents of the file come from the `TextDocumentContentProvider` |
50 | export function createHandle(provider: ExpandMacroContentProvider) { | 9 | export function expandMacro(ctx: Ctx): Cmd { |
51 | return async () => { | 10 | const tdcp = new TextDocumentContentProvider(ctx); |
52 | const uri = expandMacroUri; | 11 | ctx.pushCleanup( |
53 | 12 | vscode.workspace.registerTextDocumentContentProvider( | |
54 | const document = await vscode.workspace.openTextDocument(uri); | 13 | 'rust-analyzer', |
55 | 14 | tdcp, | |
56 | provider.eventEmitter.fire(uri); | 15 | ), |
16 | ); | ||
57 | 17 | ||
18 | return async () => { | ||
19 | const document = await vscode.workspace.openTextDocument(tdcp.uri); | ||
20 | tdcp.eventEmitter.fire(tdcp.uri); | ||
58 | return vscode.window.showTextDocument( | 21 | return vscode.window.showTextDocument( |
59 | document, | 22 | document, |
60 | vscode.ViewColumn.Two, | 23 | vscode.ViewColumn.Two, |
@@ -63,11 +26,6 @@ export function createHandle(provider: ExpandMacroContentProvider) { | |||
63 | }; | 26 | }; |
64 | } | 27 | } |
65 | 28 | ||
66 | interface MacroExpandParams { | ||
67 | textDocument: TextDocumentIdentifier; | ||
68 | position: Position; | ||
69 | } | ||
70 | |||
71 | interface ExpandedMacro { | 29 | interface ExpandedMacro { |
72 | name: string; | 30 | name: string; |
73 | expansion: string; | 31 | expansion: string; |
@@ -81,3 +39,37 @@ function code_format(expanded: ExpandedMacro): string { | |||
81 | 39 | ||
82 | return result; | 40 | return result; |
83 | } | 41 | } |
42 | |||
43 | class TextDocumentContentProvider | ||
44 | implements vscode.TextDocumentContentProvider { | ||
45 | private ctx: Ctx; | ||
46 | uri = vscode.Uri.parse('rust-analyzer://expandMacro/[EXPANSION].rs'); | ||
47 | eventEmitter = new vscode.EventEmitter<vscode.Uri>(); | ||
48 | |||
49 | constructor(ctx: Ctx) { | ||
50 | this.ctx = ctx; | ||
51 | } | ||
52 | |||
53 | async provideTextDocumentContent(_uri: vscode.Uri): Promise<string> { | ||
54 | const editor = vscode.window.activeTextEditor; | ||
55 | if (editor == null) return ''; | ||
56 | |||
57 | const position = editor.selection.active; | ||
58 | const request: lc.TextDocumentPositionParams = { | ||
59 | textDocument: { uri: editor.document.uri.toString() }, | ||
60 | position, | ||
61 | }; | ||
62 | const expanded = await this.ctx.client.sendRequest<ExpandedMacro>( | ||
63 | 'rust-analyzer/expandMacro', | ||
64 | request, | ||
65 | ); | ||
66 | |||
67 | if (expanded == null) return 'Not available'; | ||
68 | |||
69 | return code_format(expanded); | ||
70 | } | ||
71 | |||
72 | get onDidChange(): vscode.Event<vscode.Uri> { | ||
73 | return this.eventEmitter.event; | ||
74 | } | ||
75 | } | ||
diff --git a/editors/code/src/commands/index.ts b/editors/code/src/commands/index.ts index 8f91b3b7d..325ae3da8 100644 --- a/editors/code/src/commands/index.ts +++ b/editors/code/src/commands/index.ts | |||
@@ -6,7 +6,7 @@ import { joinLines } from './join_lines'; | |||
6 | import { onEnter } from './on_enter'; | 6 | import { onEnter } from './on_enter'; |
7 | import { parentModule } from './parent_module'; | 7 | import { parentModule } from './parent_module'; |
8 | import { syntaxTree } from './syntax_tree'; | 8 | import { syntaxTree } from './syntax_tree'; |
9 | import * as expandMacro from './expand_macro'; | 9 | import { expandMacro } from './expand_macro'; |
10 | import * as inlayHints from './inlay_hints'; | 10 | import * as inlayHints from './inlay_hints'; |
11 | import * as runnables from './runnables'; | 11 | import * as runnables from './runnables'; |
12 | 12 | ||
diff --git a/editors/code/src/commands/syntax_tree.ts b/editors/code/src/commands/syntax_tree.ts index e61fb36df..20ff7e5ca 100644 --- a/editors/code/src/commands/syntax_tree.ts +++ b/editors/code/src/commands/syntax_tree.ts | |||
@@ -7,12 +7,12 @@ import { Ctx, Cmd } from '../ctx'; | |||
7 | // | 7 | // |
8 | // The contents of the file come from the `TextDocumentContentProvider` | 8 | // The contents of the file come from the `TextDocumentContentProvider` |
9 | export function syntaxTree(ctx: Ctx): Cmd { | 9 | export function syntaxTree(ctx: Ctx): Cmd { |
10 | const stcp = new SyntaxTreeContentProvider(ctx); | 10 | const tdcp = new TextDocumentContentProvider(ctx); |
11 | 11 | ||
12 | ctx.pushCleanup( | 12 | ctx.pushCleanup( |
13 | vscode.workspace.registerTextDocumentContentProvider( | 13 | vscode.workspace.registerTextDocumentContentProvider( |
14 | 'rust-analyzer', | 14 | 'rust-analyzer', |
15 | stcp, | 15 | tdcp, |
16 | ), | 16 | ), |
17 | ); | 17 | ); |
18 | 18 | ||
@@ -20,7 +20,7 @@ export function syntaxTree(ctx: Ctx): Cmd { | |||
20 | (event: vscode.TextDocumentChangeEvent) => { | 20 | (event: vscode.TextDocumentChangeEvent) => { |
21 | const doc = event.document; | 21 | const doc = event.document; |
22 | if (doc.languageId !== 'rust') return; | 22 | if (doc.languageId !== 'rust') return; |
23 | afterLs(() => stcp.eventEmitter.fire(stcp.uri)); | 23 | afterLs(() => tdcp.eventEmitter.fire(tdcp.uri)); |
24 | }, | 24 | }, |
25 | ctx.subscriptions, | 25 | ctx.subscriptions, |
26 | ); | 26 | ); |
@@ -28,7 +28,7 @@ export function syntaxTree(ctx: Ctx): Cmd { | |||
28 | vscode.window.onDidChangeActiveTextEditor( | 28 | vscode.window.onDidChangeActiveTextEditor( |
29 | (editor: vscode.TextEditor | undefined) => { | 29 | (editor: vscode.TextEditor | undefined) => { |
30 | if (!editor || editor.document.languageId !== 'rust') return; | 30 | if (!editor || editor.document.languageId !== 'rust') return; |
31 | stcp.eventEmitter.fire(stcp.uri); | 31 | tdcp.eventEmitter.fire(tdcp.uri); |
32 | }, | 32 | }, |
33 | ctx.subscriptions, | 33 | ctx.subscriptions, |
34 | ); | 34 | ); |
@@ -38,12 +38,12 @@ export function syntaxTree(ctx: Ctx): Cmd { | |||
38 | const rangeEnabled = !!(editor && !editor.selection.isEmpty); | 38 | const rangeEnabled = !!(editor && !editor.selection.isEmpty); |
39 | 39 | ||
40 | const uri = rangeEnabled | 40 | const uri = rangeEnabled |
41 | ? vscode.Uri.parse(`${stcp.uri.toString()}?range=true`) | 41 | ? vscode.Uri.parse(`${tdcp.uri.toString()}?range=true`) |
42 | : stcp.uri; | 42 | : tdcp.uri; |
43 | 43 | ||
44 | const document = await vscode.workspace.openTextDocument(uri); | 44 | const document = await vscode.workspace.openTextDocument(uri); |
45 | 45 | ||
46 | stcp.eventEmitter.fire(uri); | 46 | tdcp.eventEmitter.fire(uri); |
47 | 47 | ||
48 | return vscode.window.showTextDocument( | 48 | return vscode.window.showTextDocument( |
49 | document, | 49 | document, |
@@ -64,12 +64,11 @@ interface SyntaxTreeParams { | |||
64 | range?: lc.Range; | 64 | range?: lc.Range; |
65 | } | 65 | } |
66 | 66 | ||
67 | export class SyntaxTreeContentProvider | 67 | class TextDocumentContentProvider |
68 | implements vscode.TextDocumentContentProvider { | 68 | implements vscode.TextDocumentContentProvider { |
69 | ctx: Ctx; | 69 | private ctx: Ctx; |
70 | uri = vscode.Uri.parse('rust-analyzer://syntaxtree'); | 70 | uri = vscode.Uri.parse('rust-analyzer://syntaxtree'); |
71 | eventEmitter = new vscode.EventEmitter<vscode.Uri>(); | 71 | eventEmitter = new vscode.EventEmitter<vscode.Uri>(); |
72 | syntaxTree: string = 'Not available'; | ||
73 | 72 | ||
74 | constructor(ctx: Ctx) { | 73 | constructor(ctx: Ctx) { |
75 | this.ctx = ctx; | 74 | this.ctx = ctx; |