1 files changed, 12 insertions, 34 deletions

diff --git a/editors/code/src/commands/apply_source_change.ts b/editors/code/src/commands/apply_source_change.ts
index cf921e3ac..d96ace979 100644
--- a/editors/code/src/commands/apply_source_change.ts
+++ b/editors/code/src/commands/apply_source_change.ts
@@ -3,53 +3,31 @@ import * as lc from 'vscode-languageclient';
 
 import { Server } from '../server';
 
-interface FileSystemEdit {
-    type: string;
-    uri?: string;
-    src?: string;
-    dst?: string;
-}
-
 export interface SourceChange {
     label: string;
-    sourceFileEdits: lc.TextDocumentEdit[];
-    fileSystemEdits: FileSystemEdit[];
+    workspaceEdit: lc.WorkspaceEdit;
     cursorPosition?: lc.TextDocumentPositionParams;
 }
 
 export async function handle(change: SourceChange) {
-    const wsEdit = new vscode.WorkspaceEdit();
-    for (const sourceEdit of change.sourceFileEdits) {
-        const uri = Server.client.protocol2CodeConverter.asUri(
-            sourceEdit.textDocument.uri
-        );
-        const edits = Server.client.protocol2CodeConverter.asTextEdits(
-            sourceEdit.edits
-        );
-        wsEdit.set(uri, edits);
-    }
+    const wsEdit = Server.client.protocol2CodeConverter.asWorkspaceEdit(change.workspaceEdit);
     let created;
     let moved;
-    for (const fsEdit of change.fileSystemEdits) {
-        switch (fsEdit.type) {
-            case 'createFile':
-                const uri = vscode.Uri.parse(fsEdit.uri!);
-                wsEdit.createFile(uri);
-                created = uri;
-                break;
-            case 'moveFile':
-                const src = vscode.Uri.parse(fsEdit.src!);
-                const dst = vscode.Uri.parse(fsEdit.dst!);
-                wsEdit.renameFile(src, dst);
-                moved = dst;
-                break;
+    if (change.workspaceEdit.documentChanges) {
+        for (const docChange of change.workspaceEdit.documentChanges) {
+            if (lc.CreateFile.is(docChange)) {
+                created = docChange.uri;
+            } else if (lc.RenameFile.is(docChange)) {
+                moved = docChange.newUri;
+            }
         }
     }
     const toOpen = created || moved;
     const toReveal = change.cursorPosition;
     await vscode.workspace.applyEdit(wsEdit);
     if (toOpen) {
-        const doc = await vscode.workspace.openTextDocument(toOpen);
+        const toOpenUri = vscode.Uri.parse(toOpen);
+        const doc = await vscode.workspace.openTextDocument(toOpenUri);
         await vscode.window.showTextDocument(doc);
     } else if (toReveal) {
         const uri = Server.client.protocol2CodeConverter.asUri(
@@ -65,6 +43,6 @@ export async function handle(change: SourceChange) {
         if (!editor.selection.isEmpty) {
             return;
         }
-        editor!.selection = new vscode.Selection(position, position);
+        editor.selection = new vscode.Selection(position, position);
     }
 }