(GH-136) Add restart languageserver and show logs to command palette

This the Restart Current Session and Show Connection logs to the command
palette and the click menu on the Puppet status now calls these commands
directly.

Author: jpogran

client/package.json

@@ -38,6 +38,7 @@
   ],
   "activationEvents": [
     "onLanguage:puppet",
+    "onCommand:extension.puppetShowConnectionMenu",
     "onCommand:extension.puppetLint",
     "onCommand:extension.puppetParserValidate",
     "onCommand:extension.puppetShowNodeGraphToSide",
@@ -87,6 +88,16 @@
       }
     ],
     "commands": [
+      {
+        "command": "extension.puppetRestartSession",
+        "category": "Puppet",
+        "title": "Restart Current Session"
+      },
+      {
+        "command": "extension.puppetShowConnectionLogs",
+        "category": "Puppet",
+        "title": "Show Connection Logs"
+      },
       {
         "command": "extension.pdkNewModule",
         "category": "Puppet",

client/src/commands/puppetcommands.ts

@@ -24,6 +24,14 @@ export function setupPuppetCommands(langID:string, connManager:IConnectionManage
     () => { connManager.showConnectionMenu(); }
   ));
 
+  ctx.subscriptions.push(vscode.commands.registerCommand(messages.PuppetCommandStrings.PuppetShowConnectionLogsCommandId,
+    () => { connManager.showLogger(); }
+  ));
+
+  ctx.subscriptions.push(vscode.commands.registerCommand(messages.PuppetCommandStrings.PuppetRestartSessionCommandId,
+    () => { connManager.restartConnection(); }
+  ));
+
   const contentProvider = new PuppetNodeGraphContentProvider(ctx, connManager);
   const contentProviderRegistration = vscode.workspace.registerTextDocumentContentProvider(langID, contentProvider);
 

client/src/connection.ts

@@ -41,6 +41,8 @@ export interface IConnectionManager {
   status: ConnectionStatus;
   languageClient: LanguageClient;
   showConnectionMenu();
+  showLogger();
+  restartConnection(connectionConfig?: IConnectionConfiguration);
 }
 
 export class ConnectionManager implements IConnectionManager {
@@ -60,6 +62,9 @@ export class ConnectionManager implements IConnectionManager {
   public get languageClient() : LanguageClient {
     return this.languageServerClient;
   }
+  public showLogger() {
+    this.logger.show()
+  }
 
   constructor(context: vscode.ExtensionContext, logger: Logger) {
     this.logger = logger;
@@ -387,10 +392,12 @@ export class ConnectionManager implements IConnectionManager {
     });
   }
 
-
-  private restartConnection(connectionConfig?: IConnectionConfiguration) {
-      this.stop();
-      this.start(connectionConfig);
+  public restartConnection(connectionConfig?: IConnectionConfiguration) {
+    if (connectionConfig == undefined) {
+      connectionConfig = new ConnectionConfiguration(this.extensionContext);
+    }
+    this.stop();
+    this.start(connectionConfig);
   }
 
   private createStatusBarItem() {
@@ -413,21 +420,16 @@ export class ConnectionManager implements IConnectionManager {
   public showConnectionMenu() {
     var menuItems: ConnectionMenuItem[] = [];
 
-    let currentConnectionConfig = this.connectionConfiguration;
-
     menuItems.push(
       new ConnectionMenuItem(
         "Restart Current Puppet Session",
-        () => {
-          let configuration = new ConnectionConfiguration(this.extensionContext);
-          this.restartConnection(configuration);
-        }),
+        () => { vscode.commands.executeCommand(messages.PuppetCommandStrings.PuppetRestartSessionCommandId); }),
     )
 
     menuItems.push(
       new ConnectionMenuItem(
         "Show Puppet Session Logs",
-        () => { this.logger.show(); }),
+        () => { vscode.commands.executeCommand(messages.PuppetCommandStrings.PuppetShowConnectionLogsCommandId); }),
     )
 
     vscode

client/src/messages.ts

@@ -41,6 +41,8 @@ export class PuppetCommandStrings{
   static PuppetResourceCommandId:string = 'extension.puppetResource';
   static PuppetNodeGraphToTheSideCommandId = 'extension.puppetShowNodeGraphToSide';
   static PuppetShowConnectionMenuCommandId = 'extension.puppetShowConnectionMenu';
+  static PuppetShowConnectionLogsCommandId = 'extension.puppetShowConnectionLogs';
+  static PuppetRestartSessionCommandId = 'extension.puppetRestartSession';
 }
 
 export class PDKCommandStrings {