fix query focus for all scenarios (#1543)

microsoft · Dec 12, 2019 · e3d42ca · e3d42ca
1 parent 44f17e8
commit e3d42ca
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/controllers/webviewController.ts b/src/controllers/webviewController.ts
@@ -41,10 +41,16 @@ export class WebviewPanelController implements vscode.Disposable {
         const config = this._vscodeWrapper.getConfiguration(Constants.extensionConfigSectionName, vscode.Uri.parse(uri));
         const retainContextWhenHidden = config[Constants.configPersistQueryResultTabs];
         const column = this.newResultPaneViewColumn(uri);
-        this._disposables.push(this._panel = vscode.window.createWebviewPanel(uri, title, column, {
-            retainContextWhenHidden,
-            enableScripts: true
-        }));
+        this._disposables.push(this._panel = vscode.window.createWebviewPanel(uri, title,
+            {
+                viewColumn: column,
+                preserveFocus: true
+            },
+            {
+                retainContextWhenHidden,
+                enableScripts: true
+            }
+        ));
         this._panel.onDidDispose(() => {
             this.dispose();
         });
@@ -108,8 +114,9 @@ export class WebviewPanelController implements vscode.Disposable {
         this._isDisposed = true;
     }
 
-    public revealToForeground(): void {
-        this._panel.reveal();
+    public revealToForeground(uri: string): void {
+        let column = this.newResultPaneViewColumn(uri);
+        this._panel.reveal(column, true);
     }
 
     /** Getters */

diff --git a/src/models/sqlOutputContentProvider.ts b/src/models/sqlOutputContentProvider.ts
@@ -102,11 +102,12 @@ export class SqlOutputContentProvider {
         await this.runQueryCallback(statusView ? statusView : this._statusView, uri, title,
             async (queryRunner) => {
                 if (queryRunner) {
-                    // if the panel isn't active, bring it to foreground
-                    if (!this._panels.get(uri).isActive) {
-                        this._panels.get(uri).revealToForeground();
+                    // if the panel isn't active and exists
+                    if (this._panels.get(uri).isActive === false) {
+                        this._panels.get(uri).revealToForeground(uri);
                     }
                     await queryRunner.runQuery(selection, promise);
+
                 }
             });
     }
@@ -298,7 +299,7 @@ export class SqlOutputContentProvider {
         const queryRunner = this.getQueryRunner(uri);
         // in case of a tab switch
         // and if it has rendered before
-        if (panelController.isActive &&
+        if (panelController.isActive !== undefined &&
             queryRunner.hasCompleted &&
             panelController.rendered) {
             return queryRunner.refreshQueryTab(uri);