aboutsummaryrefslogtreecommitdiff
path: root/editors/code/src/commands/apply_source_change.ts
diff options
context:
space:
mode:
Diffstat (limited to 'editors/code/src/commands/apply_source_change.ts')
-rw-r--r--editors/code/src/commands/apply_source_change.ts26
1 files changed, 13 insertions, 13 deletions
diff --git a/editors/code/src/commands/apply_source_change.ts b/editors/code/src/commands/apply_source_change.ts
index f011cbe12..67765e5a3 100644
--- a/editors/code/src/commands/apply_source_change.ts
+++ b/editors/code/src/commands/apply_source_change.ts
@@ -18,7 +18,6 @@ export interface SourceChange {
18} 18}
19 19
20export async function handle(change: SourceChange) { 20export async function handle(change: SourceChange) {
21 console.log(`applySOurceChange ${JSON.stringify(change)}`);
22 const wsEdit = new vscode.WorkspaceEdit(); 21 const wsEdit = new vscode.WorkspaceEdit();
23 for (const sourceEdit of change.sourceFileEdits) { 22 for (const sourceEdit of change.sourceFileEdits) {
24 const uri = Server.client.protocol2CodeConverter.asUri(sourceEdit.textDocument.uri); 23 const uri = Server.client.protocol2CodeConverter.asUri(sourceEdit.textDocument.uri);
@@ -28,17 +27,18 @@ export async function handle(change: SourceChange) {
28 let created; 27 let created;
29 let moved; 28 let moved;
30 for (const fsEdit of change.fileSystemEdits) { 29 for (const fsEdit of change.fileSystemEdits) {
31 if (fsEdit.type == 'createFile') { 30 switch (fsEdit.type) {
32 const uri = vscode.Uri.parse(fsEdit.uri!); 31 case 'createFile':
33 wsEdit.createFile(uri); 32 const uri = vscode.Uri.parse(fsEdit.uri!);
34 created = uri; 33 wsEdit.createFile(uri);
35 } else if (fsEdit.type == 'moveFile') { 34 created = uri;
36 const src = vscode.Uri.parse(fsEdit.src!); 35 break;
37 const dst = vscode.Uri.parse(fsEdit.dst!); 36 case 'moveFile':
38 wsEdit.renameFile(src, dst); 37 const src = vscode.Uri.parse(fsEdit.src!);
39 moved = dst; 38 const dst = vscode.Uri.parse(fsEdit.dst!);
40 } else { 39 wsEdit.renameFile(src, dst);
41 console.error(`unknown op: ${JSON.stringify(fsEdit)}`); 40 moved = dst;
41 break;
42 } 42 }
43 } 43 }
44 const toOpen = created || moved; 44 const toOpen = created || moved;
@@ -51,7 +51,7 @@ export async function handle(change: SourceChange) {
51 const uri = Server.client.protocol2CodeConverter.asUri(toReveal.textDocument.uri); 51 const uri = Server.client.protocol2CodeConverter.asUri(toReveal.textDocument.uri);
52 const position = Server.client.protocol2CodeConverter.asPosition(toReveal.position); 52 const position = Server.client.protocol2CodeConverter.asPosition(toReveal.position);
53 const editor = vscode.window.activeTextEditor; 53 const editor = vscode.window.activeTextEditor;
54 if (!editor || editor.document.uri.toString() != uri.toString()) { return; } 54 if (!editor || editor.document.uri.toString() !== uri.toString()) { return; }
55 if (!editor.selection.isEmpty) { return; } 55 if (!editor.selection.isEmpty) { return; }
56 editor!.selection = new vscode.Selection(position, position); 56 editor!.selection = new vscode.Selection(position, position);
57 } 57 }