Merge pull request #5 from dzsquared/autoconnect

Adding Connection Awareness

Author: dzsquared

.vscode/launch.json

@@ -15,7 +15,7 @@
             "name": "Extension",
             "type": "sqlopsExtensionHost",
             "request": "launch",
-            "runtimeExecutable": "sqlops",
+            "runtimeExecutable": "azuredatastudio",
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}"
             ],
@@ -28,7 +28,7 @@
             "name": "Extension Tests",
             "type": "sqlopsExtensionHost",
             "request": "launch",
-            "runtimeExecutable": "sqlops",
+            "runtimeExecutable": "azuredatastudio",
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}",
                 "--extensionTestsPath=${workspaceFolder}/out/test"

src/extension.ts

@@ -1,7 +1,8 @@
 'use strict';
 import * as vscode from 'vscode';
 import * as request from 'request-promise-native';
-//import * as sqlops from 'sqlops';
+import * as sqlops from 'sqlops';
+import { error } from 'util';
 
 
 export function activate(context: vscode.ExtensionContext) {
@@ -15,17 +16,7 @@ export function activate(context: vscode.ExtensionContext) {
         };
         console.log('Bringing in the first responder kit from the mothership.');
         const scriptText = await request.get(options);
-        var setting: vscode.Uri = vscode.Uri.parse("untitled:" + fileName);
-        vscode.workspace.openTextDocument(setting).then((a: vscode.TextDocument) => {
-            vscode.window.showTextDocument(a, 1, false).then(e => {
-                e.edit(edit => {
-                    edit.insert(new vscode.Position(0, 0), scriptText);
-                });
-            });
-        }, (error: any) => {
-            console.error(error);
-        });
-        
+        await placescript(fileName, scriptText);
     };
     var disposable_spblitz = vscode.commands.registerCommand('extension.sp_blitz', getblitz);
     context.subscriptions.push(disposable_spblitz);
@@ -38,17 +29,7 @@ export function activate(context: vscode.ExtensionContext) {
         };
         console.log('Bringing in the first responder kit from the mothership.');
         const scriptText = await request.get(options);
-        var setting: vscode.Uri = vscode.Uri.parse("untitled:" + fileName);
-        vscode.workspace.openTextDocument(setting).then((a: vscode.TextDocument) => {
-            vscode.window.showTextDocument(a, 1, false).then(e => {
-                e.edit(edit => {
-                    edit.insert(new vscode.Position(0, 0), scriptText);
-                });
-            });
-        }, (error: any) => {
-            console.error(error);
-        });
-        
+        await placescript(fileName, scriptText);
     };
     var disposable_spblitzcache = vscode.commands.registerCommand('extension.sp_blitzcache', getblitzcache);
     context.subscriptions.push(disposable_spblitzcache);
@@ -61,17 +42,7 @@ export function activate(context: vscode.ExtensionContext) {
         };
         console.log('Bringing in the first responder kit from the mothership.');
         const scriptText = await request.get(options);
-        var setting: vscode.Uri = vscode.Uri.parse("untitled:" + fileName);
-        vscode.workspace.openTextDocument(setting).then((a: vscode.TextDocument) => {
-            vscode.window.showTextDocument(a, 1, false).then(e => {
-                e.edit(edit => {
-                    edit.insert(new vscode.Position(0, 0), scriptText);
-                });
-            });
-        }, (error: any) => {
-            console.error(error);
-        });
-        
+        await placescript(fileName, scriptText);        
     };
     var disposable_spblitzfirst = vscode.commands.registerCommand('extension.sp_blitzfirst', getblitzfirst);
     context.subscriptions.push(disposable_spblitzfirst);
@@ -84,23 +55,13 @@ export function activate(context: vscode.ExtensionContext) {
         };
         console.log('Bringing in the first responder kit from the mothership.');
         const scriptText = await request.get(options);
-        var setting: vscode.Uri = vscode.Uri.parse("untitled:" + fileName);
-        vscode.workspace.openTextDocument(setting).then((a: vscode.TextDocument) => {
-            vscode.window.showTextDocument(a, 1, false).then(e => {
-                e.edit(edit => {
-                    edit.insert(new vscode.Position(0, 0), scriptText);
-                });
-            });
-        }, (error: any) => {
-            console.error(error);
-        });
-        
+        await placescript(fileName, scriptText);
     };
     var disposable_spblitzwho = vscode.commands.registerCommand('extension.sp_blitzwho', getblitzwho);
     context.subscriptions.push(disposable_spblitzwho);
 
     //creating the quickrun script
-    var disposable_runspblitz = vscode.commands.registerCommand('extension.run_sp_blitz', () => {
+    var runspblitz = async () => {
         console.log('Preparing sample run script.');
         let fileName = "exec_sp_blitz.sql";
         const scriptText = `EXEC [dbo].[sp_Blitz]
@@ -113,16 +74,9 @@ export function activate(context: vscode.ExtensionContext) {
         -- uncomment the following line to write results to an output table
         --, @OutputDatabaseName = 'DBAtools', @OutputSchemaName = 'dbo', @OutputTableName = 'BlitzResults'`;
         var setting: vscode.Uri = vscode.Uri.parse("untitled:" + fileName);
-        vscode.workspace.openTextDocument(setting).then((a: vscode.TextDocument) => {
-            vscode.window.showTextDocument(a, 1, false).then(e => {
-                e.edit(edit => {
-                    edit.insert(new vscode.Position(0, 0), scriptText);
-                });
-            });
-        }, (error: any) => {
-            console.error(error);
-        });
-    });
+        await placescript(fileName, scriptText);
+    };
+    var disposable_runspblitz = vscode.commands.registerCommand('extension.run_sp_blitz', runspblitz);
     context.subscriptions.push(disposable_runspblitz);
 
     //importing the full spblitz script
@@ -133,23 +87,13 @@ export function activate(context: vscode.ExtensionContext) {
         };
         console.log('Bringing in the first responder kit from the mothership.');
         const scriptText = await request.get(options);
-        var setting: vscode.Uri = vscode.Uri.parse("untitled:" + fileName);
-        vscode.workspace.openTextDocument(setting).then((a: vscode.TextDocument) => {
-            vscode.window.showTextDocument(a, 1, false).then(e => {
-                e.edit(edit => {
-                    edit.insert(new vscode.Position(0, 0), scriptText);
-                });
-            });
-        }, (error: any) => {
-            console.error(error);
-        });
-        
+        await placescript(fileName, scriptText);
     };
     var disposable_spblitzindex = vscode.commands.registerCommand('extension.sp_blitzindex', getblitzindex);
     context.subscriptions.push(disposable_spblitzindex);
 
     //creating the quickrun script
-    var disposable_runspblitzindex = vscode.commands.registerCommand('extension.run_sp_blitzindex', () => {
+    var runspblitzindex = async () => {
         console.log('Preparing sample run script.');
         let fileName = "exec_sp_blitzindex.sql";
         const scriptText = `EXEC [dbo].[sp_BlitzIndex]
@@ -161,64 +105,59 @@ export function activate(context: vscode.ExtensionContext) {
         @CheckServerInfo = 1
         -- uncomment the following line to write results to an output table
         --, @OutputDatabaseName = 'DBAtools', @OutputSchemaName = 'dbo', @OutputTableName = 'BlitzResults'`;
-        var setting: vscode.Uri = vscode.Uri.parse("untitled:" + fileName);
-        vscode.workspace.openTextDocument(setting).then((a: vscode.TextDocument) => {
-            vscode.window.showTextDocument(a, 1, false).then(e => {
-                e.edit(edit => {
-                    edit.insert(new vscode.Position(0, 0), scriptText);
-                });
-            });
-        }, (error: any) => {
-            console.error(error);
-        });
-    });
+        await placescript(fileName, scriptText);
+    };
+    var disposable_runspblitzindex = vscode.commands.registerCommand('extension.run_sp_blitzindex', runspblitzindex);
     context.subscriptions.push(disposable_runspblitzindex);
 
     //creating the quickrun script for blitzcache
-    var disposable_runspblitzcache = vscode.commands.registerCommand('extension.run_sp_blitzcache', () => {
+    var runspblitzcache = async () => {
         let fileName = "exec_sp_blitzcache.sql";
         console.log('Preparing sample run script.');
         const scriptText = `EXEC [dbo].[sp_BlitzCache]
         @SortOrder = 'reads',
             -- CPU, executions, xpm, recent compilations, memory grant, writes, all
         @Top = 10
         `;
-        var setting: vscode.Uri = vscode.Uri.parse("untitled:" + fileName);
-        vscode.workspace.openTextDocument(setting).then((a: vscode.TextDocument) => {
-            vscode.window.showTextDocument(a, 1, false).then(e => {
-                e.edit(edit => {
-                    edit.insert(new vscode.Position(0, 0), scriptText);
-                });
-            });
-        }, (error: any) => {
-            console.error(error);
-        });
-    });
+        await placescript(fileName, scriptText);
+    };
+    var disposable_runspblitzcache = vscode.commands.registerCommand('extension.run_sp_blitzcache',runspblitzcache)
     context.subscriptions.push(disposable_runspblitzcache);
 
     //creating the quickrun script
-    var disposable_runspblitzfirst = vscode.commands.registerCommand('extension.run_sp_blitzfirst', () => {
+    var runspblitzfirst = async () => {
         let fileName = "exec_sp_blitzfirst.sql";
         console.log('Preparing sample run script.');
         const scriptText = `EXEC [dbo].[sp_BlitzFirst]
         @Seconds = 5,
         @ShowSleepingSPIDs = 0,
         @ExpertMode = 0 --1 will also run sp_BlitzWho
         `;
-        var setting: vscode.Uri = vscode.Uri.parse("untitled:" + fileName);
-        vscode.workspace.openTextDocument(setting).then((a: vscode.TextDocument) => {
-            vscode.window.showTextDocument(a, 1, false).then(e => {
-                e.edit(edit => {
-                    edit.insert(new vscode.Position(0, 0), scriptText);
-                });
-            });
-        }, (error: any) => {
-            console.error(error);
-        });
-    });
+        await placescript(fileName, scriptText);
+    };
+    var disposable_runspblitzfirst = vscode.commands.registerCommand('extension.run_sp_blitzfirst',runspblitzfirst);
     context.subscriptions.push(disposable_runspblitzfirst);
 
 
+
+    // places scriptText into fileName editor with current connection
+    async function placescript(fileName, scriptText) {
+        var setting: vscode.Uri = vscode.Uri.parse("untitled:" + fileName);
+        try {
+            let connection = await sqlops.connection.getCurrentConnection();
+            let doc = await vscode.workspace.openTextDocument(setting);
+            let editor = await vscode.window.showTextDocument(doc, 1, false);
+            editor.edit(edit => {
+                edit.insert(new vscode.Position(0, 0), scriptText);
+            });
+            if (connection) {
+                await sqlops.queryeditor.connect(doc.uri.toString(), connection.connectionId);
+            }
+        } catch (err) {
+            vscode.window.showErrorMessage(err);
+        }
+    }
+
 }
 
 // this method is called when your extension is deactivated