From 184446db6f41035df5b588b7106171d3939e5b7d Mon Sep 17 00:00:00 2001
From: Johannes Wikman <jwikman@users.noreply.github.com>
Date: Thu, 16 Aug 2018 14:31:12 +0200
Subject: [PATCH] Make sure that file is saved before rename/reorganized

---
 src/CRSFunctions.ts | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/CRSFunctions.ts b/src/CRSFunctions.ts
index afbfd3f..27e1e2d 100644
--- a/src/CRSFunctions.ts
+++ b/src/CRSFunctions.ts
@@ -94,11 +94,10 @@ export function RunObjectWindows() {
 export function RenameCurrentFile() {
     console.log('Running: RenameCurrentFile');
 
-    vscode.window.activeTextEditor.document.save();
-
-    let newFileName = WorkspaceFiles.RenameFile(vscode.window.activeTextEditor.document.uri);
-    vscode.workspace.openTextDocument(newFileName).then(doc => vscode.window.showTextDocument(doc));
-
+    vscode.window.activeTextEditor.document.save().then(saved => {
+        let newFileName = WorkspaceFiles.RenameFile(vscode.window.activeTextEditor.document.uri);
+        vscode.workspace.openTextDocument(newFileName).then(doc => vscode.window.showTextDocument(doc));
+    })
     console.log('Done: RenameCurrentFile')
 }
 
@@ -117,11 +116,10 @@ export function RenameAllFiles() {
 export function ReorganizeCurrentFile() {
     console.log('Running: ReorganizeCurrentFile');
 
-    vscode.window.activeTextEditor.document.save();
-
-    let newFileName = WorkspaceFiles.ReorganizeFile(vscode.window.activeTextEditor.document.uri);
-    vscode.workspace.openTextDocument(newFileName).then(doc => vscode.window.showTextDocument(doc));
-
+    vscode.window.activeTextEditor.document.save().then(saved => {
+        let newFileName = WorkspaceFiles.ReorganizeFile(vscode.window.activeTextEditor.document.uri);
+        vscode.workspace.openTextDocument(newFileName).then(doc => vscode.window.showTextDocument(doc));
+    })
     console.log('Done: ReorganizeCurrentFile')
 }