(GH-61) Add click menu to Puppet status bar

Previously there was no way to restart the Language Client or view the Puppet
Client logs easily.  This commit adds a click menu which displays an option to
either restart the Lanugage Client or view the connection logs.  The location
to click is on the Language Server status bar item in the bottom right corner.

Author: glennsarti

client/src/configuration.ts

@@ -0,0 +1,27 @@
+'use strict';
+
+import * as vscode from 'vscode';
+
+import { ConnectionManager, IConnectionConfiguration, ConnectionType } from './connection';
+
+export class ConnectionConfiguration implements IConnectionConfiguration {
+  public type: ConnectionType = ConnectionType.Unknown; 
+  public host: string = undefined;
+  public port: number = undefined;
+  public timeout: number = undefined;
+  public preLoadPuppet: boolean = undefined;
+  public debugFilePath: string = undefined;
+  public puppetAgentDir: string = undefined;
+
+  constructor(context: vscode.ExtensionContext) {
+    let config = vscode.workspace.getConfiguration('puppet');
+
+    this.host          = config['languageserver']['address'];
+    this.port          = config['languageserver']['port'];
+    this.timeout       = config['languageserver']['timeout'];
+    this.preLoadPuppet = config['languageserver']['preLoadPuppet'];
+    this.debugFilePath = config['languageserver']['debugFilePath'];
+    
+    this.puppetAgentDir = config['puppetAgentDir'];
+  }
+}

client/src/connection.ts

@@ -4,6 +4,7 @@ import vscode = require('vscode');
 import cp = require('child_process');
 import { Logger } from '../src/logging';
 import { LanguageClient, LanguageClientOptions, ServerOptions } from 'vscode-languageclient';
+import { ConnectionConfiguration } from './configuration';
 import { setupPuppetCommands } from '../src/commands/puppetcommands';
 import { setupPDKCommands } from '../src/commands/pdkcommands';
 import { reporter } from './telemetry/telemetry';
@@ -39,6 +40,7 @@ export interface IConnectionConfiguration {
 export interface IConnectionManager {
   status: ConnectionStatus;
   languageClient: LanguageClient;
+  showConnectionMenu();
 }
 
 export class ConnectionManager implements IConnectionManager {
@@ -78,7 +80,7 @@ export class ConnectionManager implements IConnectionManager {
       this.terminal = vscode.window.createTerminal('Puppet PDK');
       this.terminal.processId.then(
         pid => {
-          console.log("pdk shell started, pid: " + pid);
+          this.logger.debug("pdk shell started, pid: " + pid);
         });
       setupPDKCommands(langID, this, this.extensionContext, this.logger, this.terminal);
       this.extensionContext.subscriptions.push(this.terminal);
@@ -395,8 +397,7 @@ export class ConnectionManager implements IConnectionManager {
     if (this.statusBarItem === undefined) {
       this.statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 1);
 
-      // TODO: Add a command here to show the connection menu
-      // this.statusBarItem.command = this.ShowConnectionMenuCommandName;
+      this.statusBarItem.command = messages.PuppetCommandStrings.PuppetShowConnectionMenuCommandId;
       this.statusBarItem.show();
       vscode.window.onDidChangeActiveTextEditor(textEditor => {
         if (textEditor === undefined || textEditor.document.languageId !== "puppet") {
@@ -409,6 +410,32 @@ 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);
+        }),
+    )
+
+    menuItems.push(
+      new ConnectionMenuItem(
+        "Show Puppet Session Logs",
+        () => { this.logger.show(); }),
+    )
+
+    vscode
+      .window
+      .showQuickPick<ConnectionMenuItem>(menuItems)
+      .then((selectedItem) => { selectedItem.callback(); });
+  }
+
   private setConnectionStatus(statusText: string, status: ConnectionStatus): void {
     // Set color and icon for 'Running' by default
     var statusIconText = "$(terminal) ";
@@ -432,3 +459,11 @@ export class ConnectionManager implements IConnectionManager {
     this.setConnectionStatus("Starting Error", ConnectionStatus.Failed);
   }
 }
+
+class ConnectionMenuItem implements vscode.QuickPickItem {
+  public description: string;
+
+  constructor(public readonly label: string, public readonly callback: () => void = () => { })
+  {
+  }
+}

client/src/extension.ts

@@ -4,6 +4,7 @@ import * as vscode from 'vscode';
 import * as path from 'path';
 
 import { ConnectionManager, IConnectionConfiguration, ConnectionType } from './connection';
+import { ConnectionConfiguration } from './configuration';
 import { Logger } from './logging';
 import { Reporter } from './telemetry/telemetry';
 
@@ -13,28 +14,6 @@ var serverProc;
 
 var connManager: ConnectionManager = undefined;
 
-export class ConnectionConfiguration implements IConnectionConfiguration {
-  public type: ConnectionType = ConnectionType.Unknown; 
-  public host: string = undefined;
-  public port: number = undefined;
-  public timeout: number = undefined;
-  public preLoadPuppet: boolean = undefined;
-  public debugFilePath: string = undefined;
-  public puppetAgentDir: string = undefined;
-
-  constructor(context: vscode.ExtensionContext) {
-    let config = vscode.workspace.getConfiguration('puppet');
-
-    this.host          = config['languageserver']['address'];
-    this.port          = config['languageserver']['port'];
-    this.timeout       = config['languageserver']['timeout'];
-    this.preLoadPuppet = config['languageserver']['preLoadPuppet'];
-    this.debugFilePath = config['languageserver']['debugFilePath'];
-    
-    this.puppetAgentDir = config['puppetAgentDir'];
-  }
-}
-
 export function activate(context: vscode.ExtensionContext) {
   const puppetExtension = vscode.extensions.getExtension('jpogran.puppet-vscode')!;
   const puppetExtensionVersion = puppetExtension.packageJSON.version;

client/src/logging.ts

@@ -19,7 +19,6 @@ export class Logger {
 
   constructor() {
     this.logChannel = vscode.window.createOutputChannel("Puppet");
-    this.logChannel.show();
 
     let config = vscode.workspace.getConfiguration('puppet');
     let logLevelName = config['languageclient']['minimumUserLogLevel'];
@@ -33,6 +32,10 @@ export class Logger {
     }
   }
 
+  public show(){
+    this.logChannel.show();
+  }
+
   public verbose(message: string) {
     this.logWithLevel(LogLevel.Verbose, message);
   }

client/src/messages.ts

@@ -40,6 +40,7 @@ export interface CompileNodeGraphResponse {
 export class PuppetCommandStrings{
   static PuppetResourceCommandId:string = 'extension.puppetResource';
   static PuppetNodeGraphToTheSideCommandId = 'extension.puppetShowNodeGraphToSide';
+  static PuppetShowConnectionMenuCommandId = 'extension.puppetShowConnectionMenu';
 }
 
 export class PDKCommandStrings {