Merge pull request #209 from sebjulliand/fix/cancelButtonAfterError

Always turn cancel button off when a query is done

Author: davecharron

src/views/results/resultSetPanelProvider.ts

@@ -1,10 +1,10 @@
-import { WebviewView, WebviewViewResolveContext, CancellationToken, commands } from "vscode";
+import { CancellationToken, WebviewView, WebviewViewResolveContext, commands } from "vscode";
 
+import { setCancelButtonVisibility } from ".";
+import { JobManager } from "../../config";
 import { Query, QueryState } from "../../connection/query";
-import * as html from "./html";
 import { updateStatusBar } from "../jobManager/statusBar";
-import { JobManager } from "../../config";
-import { setCancelButtonVisibility } from ".";
+import * as html from "./html";
 
 export class ResultSetPanelProvider {
   _view: WebviewView;
@@ -40,8 +40,6 @@ export class ResultSetPanelProvider {
 
           let queryResults = queryObject.getState() == QueryState.RUN_MORE_DATA_AVAILABLE ? await queryObject.fetchMore() : await queryObject.run();
 
-          setCancelButtonVisibility(false);
-
           data = queryResults.data;
           this._view.webview.postMessage({
             command: `rows`,
@@ -62,6 +60,7 @@ export class ResultSetPanelProvider {
           });
         }
 
+        setCancelButtonVisibility(false);
         updateStatusBar();
       }
     });