diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-31 17:59:59 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-31 17:59:59 +0000 |
commit | e4d217074d1f2c922cf8c5a247ca05fa06b0b7ed (patch) | |
tree | 1df182b9755a83c460c928ad8a0bf5ff76548e3c /editors/code/src/commands | |
parent | c8b98c46675396c4f9d26c6b001e01c81d84b89e (diff) | |
parent | ff0ceb30a9ab4162d0f1241d8b0f9aa531c3c9d2 (diff) |
Merge #2711
2711: Add semicolons 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 | 2 | ||||
-rw-r--r-- | editors/code/src/commands/expand_macro.ts | 2 | ||||
-rw-r--r-- | editors/code/src/commands/index.ts | 4 | ||||
-rw-r--r-- | editors/code/src/commands/syntax_tree.ts | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/editors/code/src/commands/analyzer_status.ts b/editors/code/src/commands/analyzer_status.ts index cf37dc6f0..cfe7d1af0 100644 --- a/editors/code/src/commands/analyzer_status.ts +++ b/editors/code/src/commands/analyzer_status.ts | |||
@@ -49,7 +49,7 @@ class TextDocumentContentProvider | |||
49 | _uri: vscode.Uri, | 49 | _uri: vscode.Uri, |
50 | ): vscode.ProviderResult<string> { | 50 | ): vscode.ProviderResult<string> { |
51 | const editor = vscode.window.activeTextEditor; | 51 | const editor = vscode.window.activeTextEditor; |
52 | const client = this.ctx.client | 52 | const client = this.ctx.client; |
53 | if (!editor || !client) return ''; | 53 | if (!editor || !client) return ''; |
54 | 54 | ||
55 | return client.sendRequest<string>( | 55 | return client.sendRequest<string>( |
diff --git a/editors/code/src/commands/expand_macro.ts b/editors/code/src/commands/expand_macro.ts index 472f43b8d..dcdde78af 100644 --- a/editors/code/src/commands/expand_macro.ts +++ b/editors/code/src/commands/expand_macro.ts | |||
@@ -52,7 +52,7 @@ class TextDocumentContentProvider | |||
52 | 52 | ||
53 | async provideTextDocumentContent(_uri: vscode.Uri): Promise<string> { | 53 | async provideTextDocumentContent(_uri: vscode.Uri): Promise<string> { |
54 | const editor = vscode.window.activeTextEditor; | 54 | const editor = vscode.window.activeTextEditor; |
55 | const client = this.ctx.client | 55 | const client = this.ctx.client; |
56 | if (!editor || !client) return ''; | 56 | if (!editor || !client) return ''; |
57 | 57 | ||
58 | const position = editor.selection.active; | 58 | const position = editor.selection.active; |
diff --git a/editors/code/src/commands/index.ts b/editors/code/src/commands/index.ts index 4431fdcf6..9a1697dcb 100644 --- a/editors/code/src/commands/index.ts +++ b/editors/code/src/commands/index.ts | |||
@@ -36,14 +36,14 @@ function showReferences(ctx: Ctx): Cmd { | |||
36 | function applySourceChange(ctx: Ctx): Cmd { | 36 | function applySourceChange(ctx: Ctx): Cmd { |
37 | return async (change: sourceChange.SourceChange) => { | 37 | return async (change: sourceChange.SourceChange) => { |
38 | sourceChange.applySourceChange(ctx, change); | 38 | sourceChange.applySourceChange(ctx, change); |
39 | } | 39 | }; |
40 | } | 40 | } |
41 | 41 | ||
42 | function reload(ctx: Ctx): Cmd { | 42 | function reload(ctx: Ctx): Cmd { |
43 | return async () => { | 43 | return async () => { |
44 | vscode.window.showInformationMessage('Reloading rust-analyzer...'); | 44 | vscode.window.showInformationMessage('Reloading rust-analyzer...'); |
45 | await ctx.restartServer(); | 45 | await ctx.restartServer(); |
46 | } | 46 | }; |
47 | } | 47 | } |
48 | 48 | ||
49 | export { | 49 | export { |
diff --git a/editors/code/src/commands/syntax_tree.ts b/editors/code/src/commands/syntax_tree.ts index 2ee80f910..02ea9f166 100644 --- a/editors/code/src/commands/syntax_tree.ts +++ b/editors/code/src/commands/syntax_tree.ts | |||
@@ -76,7 +76,7 @@ class TextDocumentContentProvider | |||
76 | 76 | ||
77 | provideTextDocumentContent(uri: vscode.Uri): vscode.ProviderResult<string> { | 77 | provideTextDocumentContent(uri: vscode.Uri): vscode.ProviderResult<string> { |
78 | const editor = vscode.window.activeTextEditor; | 78 | const editor = vscode.window.activeTextEditor; |
79 | const client = this.ctx.client | 79 | const client = this.ctx.client; |
80 | if (!editor || !client) return ''; | 80 | if (!editor || !client) return ''; |
81 | 81 | ||
82 | let range: lc.Range | undefined; | 82 | let range: lc.Range | undefined; |