Merge pull request #1006 from gjsjohnmurray/fix-1005

Skip triggering refreshes at end of some checkConnection calls

Author: gjsjohnmurray

src/api/index.ts

@@ -343,7 +343,11 @@ export class AtelierAPI {
         authRequestMap.delete(target);
         if (this.wsOrFile && !checkingConnection) {
           setTimeout(() => {
-            checkConnection(password ? true : false, typeof this.wsOrFile === "object" ? this.wsOrFile : undefined);
+            checkConnection(
+              password ? true : false,
+              typeof this.wsOrFile === "object" ? this.wsOrFile : undefined,
+              true
+            );
           }, 500);
         }
         throw { statusCode: response.status, message: response.statusText };
@@ -425,7 +429,7 @@ export class AtelierAPI {
         workspaceState.update(this.configName + ":host", undefined);
         workspaceState.update(this.configName + ":port", undefined);
         if (!checkingConnection) {
-          setTimeout(checkConnection, 30000);
+          setTimeout(() => checkConnection(false, undefined, true), 30000);
         }
       } else if (error.code === "EPROTO") {
         // This can happen if https was configured but didn't work

src/commands/serverActions.ts

@@ -53,7 +53,7 @@ export async function serverActions(): Promise<void> {
         return connConfig.update("conn", { ...targetConfig, active: !active }, target);
       }
       case "refreshConnection": {
-        await checkConnection(true);
+        await checkConnection(true, undefined, true);
         break;
       }
       default:

src/extension.ts

@@ -232,7 +232,11 @@ export function getResolvedConnectionSpec(key: string, dflt: any): any {
  */
 export const cspApps: Map<string, string[]> = new Map();
 
-export async function checkConnection(clearCookies = false, uri?: vscode.Uri): Promise<void> {
+export async function checkConnection(
+  clearCookies = false,
+  uri?: vscode.Uri,
+  triggerRefreshes?: boolean
+): Promise<void> {
   // Do nothing if already checking the connection
   if (checkingConnection) {
     return;
@@ -419,16 +423,18 @@ export async function checkConnection(clearCookies = false, uri?: vscode.Uri): P
     })
     .finally(() => {
       checkingConnection = false;
-      setTimeout(() => {
-        explorerProvider.refresh();
-        projectsExplorerProvider.refresh();
-        // Refreshing Files Explorer also switches to it, so only do this if the uri is part of the workspace,
-        // otherwise files opened from ObjectScript Explorer (objectscript:// or isfs:// depending on the "objectscript.serverSideEditing" setting)
-        // will cause an unwanted switch.
-        if (uri && schemas.includes(uri.scheme) && vscode.workspace.getWorkspaceFolder(uri)) {
-          vscode.commands.executeCommand("workbench.files.action.refreshFilesExplorer");
-        }
-      }, 20);
+      if (triggerRefreshes) {
+        setTimeout(() => {
+          explorerProvider.refresh();
+          projectsExplorerProvider.refresh();
+          // Refreshing Files Explorer also switches to it, so only do this if the uri is part of the workspace,
+          // otherwise files opened from ObjectScript Explorer (objectscript:// or isfs:// depending on the "objectscript.serverSideEditing" setting)
+          // will cause an unwanted switch.
+          if (uri && schemas.includes(uri.scheme) && vscode.workspace.getWorkspaceFolder(uri)) {
+            vscode.commands.executeCommand("workbench.files.action.refreshFilesExplorer");
+          }
+        }, 20);
+      }
     });
 }
 
@@ -601,7 +607,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
       try {
         await resolveConnectionSpec(serverName);
       } finally {
-        await checkConnection(true, uri);
+        await checkConnection(true, uri, true);
       }
     } catch (_) {
       // Ignore any failure
@@ -1067,7 +1073,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
             refreshFilesExplorer = true;
           }
           try {
-            await checkConnection(true, folder.uri);
+            await checkConnection(true, folder.uri, true);
           } catch (_) {
             continue;
           }