Merge ea16e77 into 6247dc0

microsoft · Nov 18, 2019 · e656d98 · e656d98
2 parents 6247dc0 + ea16e77
commit e656d98
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 13 deletions.
diff --git a/src/controllers/queryRunner.ts b/src/controllers/queryRunner.ts
@@ -515,7 +515,12 @@ export default class QueryRunner {
             if (activeTextEditor) {
                 column = activeTextEditor.viewColumn;
             }
-            let editor = await this._vscodeWrapper.showTextDocument(doc, column);
+            let editor = await this._vscodeWrapper.showTextDocument(doc,
+            {
+                viewColumn: column,
+                preserveFocus: false,
+                preview: false
+            });
             let querySelection = new vscode.Selection(
                 selection.startLine,
                 selection.startColumn,

diff --git a/src/controllers/untitledSqlDocumentService.ts b/src/controllers/untitledSqlDocumentService.ts
@@ -22,7 +22,12 @@ export default class UntitledSqlDocumentService {
         // Open an untitled document. So the  file doesn't have to exist in disk
         let doc = await this.vscodeWrapper.openMsSqlTextDocument(content);
         // Show the new untitled document in the editor's first tab and change the focus to it.
-        const editor = await this.vscodeWrapper.showTextDocument(doc, 1, false);
+        const editor = await this.vscodeWrapper.showTextDocument(doc,
+            {
+                viewColumn: vscode.ViewColumn.One,
+                preserveFocus: false,
+                preview: false
+            });
         const position = editor.selection.active;
         let newPosition = position.with(position.line + 1, 0);
         let newSelection = new vscode.Selection(newPosition, newPosition);

diff --git a/src/controllers/vscodeWrapper.ts b/src/controllers/vscodeWrapper.ts
@@ -9,6 +9,7 @@ import vscode = require('vscode');
 import * as Constants from './../constants/constants';
 
 export import TextEditor = vscode.TextEditor;
+import { TextDocumentShowOptions } from 'vscode';
 
 export default class VscodeWrapper {
 
@@ -277,8 +278,8 @@ export default class VscodeWrapper {
      * @param preserveFocus When `true` the editor will not take focus.
      * @return A promise that resolves to an [editor](#TextEditor).
      */
-    public async showTextDocument(document: vscode.TextDocument, column?: vscode.ViewColumn, preserveFocus?: boolean): Promise<vscode.TextEditor> {
-        const editor = await vscode.window.showTextDocument(document, column, preserveFocus);
+    public async showTextDocument(document: vscode.TextDocument, options: TextDocumentShowOptions): Promise<vscode.TextEditor> {
+        const editor = await vscode.window.showTextDocument(document, options);
         return editor;
     }
 

diff --git a/src/models/resultsSerializer.ts b/src/models/resultsSerializer.ts
@@ -234,7 +234,11 @@ export default class ResultsSerializer {
             let uri = vscode.Uri.file(filePath);
             self._vscodeWrapper.openTextDocument(uri).then((doc: vscode.TextDocument) => {
                 // Show open document and set focus
-                self._vscodeWrapper.showTextDocument(doc, 1, false).then(undefined, (error: any) => {
+                self._vscodeWrapper.showTextDocument(doc,
+                {
+                    viewColumn: vscode.ViewColumn.One,
+                    preserveFocus: false,
+                    preview: false}).then(undefined, (error: any) => {
                     self._vscodeWrapper.showErrorMessage(error);
                 });
             }, (error: any) => {

diff --git a/test/queryRunner.test.ts b/test/queryRunner.test.ts
@@ -686,7 +686,7 @@ suite('Query Runner tests', () => {
             queryRunner.setEditorSelection(selection).then(() => {
                 try {
                     // Then showTextDocument gets called with the existing editor's column
-                    testVscodeWrapper.verify(x => x.showTextDocument(editor.document, queryColumn), TypeMoq.Times.once());
+                    testVscodeWrapper.verify(x => x.showTextDocument(editor.document, TypeMoq.It.isAny()), TypeMoq.Times.once());
                     done();
                 } catch (err) {
                     done(err);
@@ -719,7 +719,7 @@ suite('Query Runner tests', () => {
             queryRunner.setEditorSelection({ startColumn: 0, startLine: 0, endColumn: 1, endLine: 1 }).then(() => {
                 try {
                     // Then showTextDocument gets called with the default first column
-                    testVscodeWrapper.verify(x => x.showTextDocument(editor.document, 1), TypeMoq.Times.once());
+                    testVscodeWrapper.verify(x => x.showTextDocument(editor.document, TypeMoq.It.isAny()), TypeMoq.Times.once());
                     done();
                 } catch (err) {
                     done(err);

diff --git a/test/saveResults.test.ts b/test/saveResults.test.ts
@@ -67,13 +67,13 @@ suite('save results tests', () => {
         vscodeWrapper.setup(x => x.openTextDocument(TypeMoq.It.isAny())).returns(() => {
                                             return Promise.resolve(undefined);
                                         });
-        vscodeWrapper.setup(x => x.showTextDocument(TypeMoq.It.isAny())).returns(() => {
+        vscodeWrapper.setup(x => x.showTextDocument(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => {
                                             return Promise.resolve(undefined);
                                         });
         vscodeWrapper.setup(x => x.showTextDocument(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => {
                                             return Promise.resolve(undefined);
                                         });
-        vscodeWrapper.setup(x => x.showTextDocument(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => {
+        vscodeWrapper.setup(x => x.showTextDocument(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => {
                                             return Promise.resolve(undefined);
                                         });
         vscodeWrapper.setup(x => x.showSaveDialog(TypeMoq.It.isAny())).returns(() => Promise.resolve(fileUri));
@@ -145,7 +145,7 @@ suite('save results tests', () => {
         vscodeWrapper.setup(x => x.openTextDocument(TypeMoq.It.isAny())).returns(() => {
                                             return Promise.resolve(undefined);
                                         });
-        vscodeWrapper.setup(x => x.showTextDocument(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => {
+        vscodeWrapper.setup(x => x.showTextDocument(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => {
                                             return Promise.resolve(undefined);
                                         });
         vscodeWrapper.setup(x => x.showSaveDialog(TypeMoq.It.isAny())).returns(() => Promise.resolve(fileUri));
@@ -181,7 +181,7 @@ suite('save results tests', () => {
         vscodeWrapper.setup(x => x.openTextDocument(TypeMoq.It.isAny())).returns(() => {
                                             return Promise.resolve(undefined);
                                         });
-        vscodeWrapper.setup(x => x.showTextDocument(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => {
+        vscodeWrapper.setup(x => x.showTextDocument(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => {
                                             return Promise.resolve(undefined);
                                         });
         vscodeWrapper.setup(x => x.showSaveDialog(TypeMoq.It.isAny())).returns(() => Promise.resolve(fileUri));

diff --git a/test/untitledSqlDocumentService.test.ts b/test/untitledSqlDocumentService.test.ts
@@ -47,7 +47,7 @@ suite('UntitledSqlDocumentService Tests', () => {
          vscodeWrapper.setup(x => x.textDocuments).returns(() => { return fixture.textDocuments; });
          vscodeWrapper.setup(x => x.openMsSqlTextDocument())
          .returns(() => { return Promise.resolve(createTextDocumentObject()); });
-         vscodeWrapper.setup(x => x.showTextDocument(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()))
+         vscodeWrapper.setup(x => x.showTextDocument(TypeMoq.It.isAny(), TypeMoq.It.isAny()))
          .returns(() => { return Promise.resolve(TypeMoq.It.isAny()); });
          fixture.vscodeWrapper = vscodeWrapper;
          fixture.service = new UntitledSqlDocumentService(vscodeWrapper.object);
@@ -66,7 +66,7 @@ suite('UntitledSqlDocumentService Tests', () => {
 
         fixture.service.newQuery().then(result => {
             fixture.vscodeWrapper.verify(x => x.openMsSqlTextDocument(), TypeMoq.Times.once());
-            fixture.vscodeWrapper.verify(x => x.showTextDocument(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
+            fixture.vscodeWrapper.verify(x => x.showTextDocument(TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
         });
      });
 });