feat(cmds): joinLines extension (#259)

fannheyward · May 25, 2020 · b3b32ee · b3b32ee
1 parent c74c1fd
commit b3b32ee
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/cmds/join_lines.ts b/src/cmds/join_lines.ts
@@ -1,7 +1,6 @@
 import { workspace } from 'coc.nvim';
 import { Cmd, Ctx, isRustDocument } from '../ctx';
 import * as ra from '../rust-analyzer-api';
-import { applySourceChange } from '../source_change';
 
 export function joinLines(ctx: Ctx): Cmd {
   return async () => {
@@ -15,9 +14,9 @@ export function joinLines(ctx: Ctx): Cmd {
     }
     const param: ra.JoinLinesParams = {
       textDocument: { uri: doc.uri },
-      range,
+      ranges: [range],
     };
-    const change = await ctx.client.sendRequest(ra.joinLines, param);
-    await applySourceChange(change);
+    const items = await ctx.client.sendRequest(ra.joinLines, param);
+    await doc.applyEdits(items);
   };
 }
diff --git a/src/rust-analyzer-api.ts b/src/rust-analyzer-api.ts
@@ -2,7 +2,17 @@
  * This file mirrors `crates/rust-analyzer/src/req.rs` declarations.
  */
 
-import { Location, NotificationType, Position, Range, RequestType, TextDocumentIdentifier, TextDocumentPositionParams, WorkspaceEdit } from 'vscode-languageserver-protocol';
+import {
+  Location,
+  NotificationType,
+  Position,
+  Range,
+  RequestType,
+  TextDocumentIdentifier,
+  TextDocumentPositionParams,
+  TextEdit,
+  WorkspaceEdit,
+} from 'vscode-languageserver-protocol';
 
 type Option<T> = null | T;
 type Vec<T> = T[];
@@ -56,9 +66,9 @@ export const parentModule = request<TextDocumentPositionParams, Vec<Location>>('
 
 export interface JoinLinesParams {
   textDocument: TextDocumentIdentifier;
-  range: Range;
+  ranges: Range[];
 }
-export const joinLines = request<JoinLinesParams, SourceChange>('joinLines');
+export const joinLines = new RequestType<JoinLinesParams, TextEdit[], unknown>('experimental/joinLines');
 
 export const onEnter = request<TextDocumentPositionParams, Option<SourceChange>>('onEnter');