diff options
author | Seivan Heidari <[email protected]> | 2019-12-23 14:35:31 +0000 |
---|---|---|
committer | Seivan Heidari <[email protected]> | 2019-12-23 14:35:31 +0000 |
commit | b21d9337d9200e2cfdc90b386591c72c302dc03e (patch) | |
tree | f81f5c08f821115cee26fa4d3ceaae88c7807fd5 /editors/code/src/commands/join_lines.ts | |
parent | 18a0937585b836ec5ed054b9ae48e0156ab6d9ef (diff) | |
parent | ce07a2daa9e53aa86a769f8641b14c2878444fbc (diff) |
Merge branch 'master' into feature/themes
Diffstat (limited to 'editors/code/src/commands/join_lines.ts')
-rw-r--r-- | editors/code/src/commands/join_lines.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editors/code/src/commands/join_lines.ts b/editors/code/src/commands/join_lines.ts index 0d4b12f4d..134ddc801 100644 --- a/editors/code/src/commands/join_lines.ts +++ b/editors/code/src/commands/join_lines.ts | |||
@@ -4,7 +4,7 @@ import { Range, TextDocumentIdentifier } from 'vscode-languageclient'; | |||
4 | import { Server } from '../server'; | 4 | import { Server } from '../server'; |
5 | import { | 5 | import { |
6 | handle as applySourceChange, | 6 | handle as applySourceChange, |
7 | SourceChange | 7 | SourceChange, |
8 | } from './apply_source_change'; | 8 | } from './apply_source_change'; |
9 | 9 | ||
10 | interface JoinLinesParams { | 10 | interface JoinLinesParams { |
@@ -19,11 +19,11 @@ export async function handle() { | |||
19 | } | 19 | } |
20 | const request: JoinLinesParams = { | 20 | const request: JoinLinesParams = { |
21 | range: Server.client.code2ProtocolConverter.asRange(editor.selection), | 21 | range: Server.client.code2ProtocolConverter.asRange(editor.selection), |
22 | textDocument: { uri: editor.document.uri.toString() } | 22 | textDocument: { uri: editor.document.uri.toString() }, |
23 | }; | 23 | }; |
24 | const change = await Server.client.sendRequest<SourceChange>( | 24 | const change = await Server.client.sendRequest<SourceChange>( |
25 | 'rust-analyzer/joinLines', | 25 | 'rust-analyzer/joinLines', |
26 | request | 26 | request, |
27 | ); | 27 | ); |
28 | await applySourceChange(change); | 28 | await applySourceChange(change); |
29 | } | 29 | } |