Merge pull request #366 from timleavitt/fix-extension-reload

Fix extension reload

Author: gjsjohnmurray

src/commands/studio.ts

@@ -59,6 +59,9 @@ function getOtherStudioActionLabel(action: OtherStudioAction): string {
   return label;
 }
 
+// Used to avoid triggering the edit listener when files are reloaded by an extension
+const suppressEditListenerMap = new Map<string, boolean>();
+
 class StudioActions {
   private uri: vscode.Uri;
   private api: AtelierAPI;
@@ -86,10 +89,6 @@ class StudioActions {
       outputChannel.appendLine(errorText);
       outputChannel.show();
     }
-    if (userAction.reload) {
-      const document = vscode.window.activeTextEditor.document;
-      loadChanges([currentFile(document)]);
-    }
     if (config().studioActionDebugOutput) {
       outputChannel.appendLine(JSON.stringify(userAction));
     }
@@ -267,6 +266,14 @@ class StudioActions {
               }
               const actionToProcess = data.result.content.pop();
 
+              if (actionToProcess.reload) {
+                const document = vscode.window.activeTextEditor.document;
+                const file = currentFile(document);
+                // Avoid the reload triggering the edit listener here
+                suppressEditListenerMap.set(file.uri.toString(), true);
+                await loadChanges([file]);
+              }
+
               // CSP pages should not have a progress bar
               if (actionToProcess.action === 2) {
                 resolve();
@@ -359,6 +366,12 @@ class StudioActions {
       label: getOtherStudioActionLabel(action),
     };
     if (action === OtherStudioAction.AttemptedEdit) {
+      // Check to see if this "attempted edit" was an action by this extension due to a reload.
+      // There's no way to detect at a higher level from the event.
+      if (suppressEditListenerMap.has(this.uri.toString())) {
+        suppressEditListenerMap.delete(this.uri.toString());
+        return;
+      }
       const query = "select * from %Atelier_v1_Utils.Extension_GetStatus(?)";
       this.api.actionQuery(query, [this.name]).then((statusObj) => {
         const docStatus = statusObj.result.content.pop();