diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-09 19:31:27 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-09 19:31:27 +0000 |
commit | e292573f425eece6f1666e051d7fe64b79640d39 (patch) | |
tree | 16d7de77952895b4cebf1cbb7a18652eaf4d98b6 /editors/code/src/events | |
parent | 897b550049d8889804bb476e305427d07879cd63 (diff) | |
parent | 273299693b85996878907ad256ed55f072ec3f1a (diff) |
Merge #2514
2514: Code: enable prettier trailing commas r=matklad a=lnicola
See #2512.
Co-authored-by: Laurențiu Nicola <[email protected]>
Diffstat (limited to 'editors/code/src/events')
-rw-r--r-- | editors/code/src/events/change_active_text_editor.ts | 6 | ||||
-rw-r--r-- | editors/code/src/events/change_text_document.ts | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editors/code/src/events/change_active_text_editor.ts b/editors/code/src/events/change_active_text_editor.ts index 64be56225..74b91bd48 100644 --- a/editors/code/src/events/change_active_text_editor.ts +++ b/editors/code/src/events/change_active_text_editor.ts | |||
@@ -3,7 +3,7 @@ import { TextDocumentIdentifier } from 'vscode-languageclient'; | |||
3 | 3 | ||
4 | import { | 4 | import { |
5 | SyntaxTreeContentProvider, | 5 | SyntaxTreeContentProvider, |
6 | syntaxTreeUri | 6 | syntaxTreeUri, |
7 | } from '../commands/syntaxTree'; | 7 | } from '../commands/syntaxTree'; |
8 | import { Decoration } from '../highlighting'; | 8 | import { Decoration } from '../highlighting'; |
9 | import { Server } from '../server'; | 9 | import { Server } from '../server'; |
@@ -21,11 +21,11 @@ export function makeHandler(syntaxTreeProvider: SyntaxTreeContentProvider) { | |||
21 | } | 21 | } |
22 | 22 | ||
23 | const params: TextDocumentIdentifier = { | 23 | const params: TextDocumentIdentifier = { |
24 | uri: editor.document.uri.toString() | 24 | uri: editor.document.uri.toString(), |
25 | }; | 25 | }; |
26 | const decorations = await Server.client.sendRequest<Decoration[]>( | 26 | const decorations = await Server.client.sendRequest<Decoration[]>( |
27 | 'rust-analyzer/decorationsRequest', | 27 | 'rust-analyzer/decorationsRequest', |
28 | params | 28 | params, |
29 | ); | 29 | ); |
30 | Server.highlighter.setHighlights(editor, decorations); | 30 | Server.highlighter.setHighlights(editor, decorations); |
31 | }; | 31 | }; |
diff --git a/editors/code/src/events/change_text_document.ts b/editors/code/src/events/change_text_document.ts index 89488bc61..2e998e889 100644 --- a/editors/code/src/events/change_text_document.ts +++ b/editors/code/src/events/change_text_document.ts | |||
@@ -2,7 +2,7 @@ import * as vscode from 'vscode'; | |||
2 | 2 | ||
3 | import { | 3 | import { |
4 | SyntaxTreeContentProvider, | 4 | SyntaxTreeContentProvider, |
5 | syntaxTreeUri | 5 | syntaxTreeUri, |
6 | } from '../commands/syntaxTree'; | 6 | } from '../commands/syntaxTree'; |
7 | 7 | ||
8 | export function createHandler(syntaxTreeProvider: SyntaxTreeContentProvider) { | 8 | export function createHandler(syntaxTreeProvider: SyntaxTreeContentProvider) { |