Update extension to honor local language server settings

This commit updates the local language server invocation to honor the extension
settings, for example, port or debug file.  This commit removes the
stopOnClientExit property as it does not make sense on the local language server
and will cause issues on extension restart.  This commit adds a debugFilePath
setting for the local language server to direct all debug output to this file.

Author: glennsarti

client/package.json

@@ -83,27 +83,27 @@
         "puppet.languageserver.address": {
           "type": "string",
           "default": "127.0.0.1",
-          "description": "The address of the VSCode languge sever to connect to"
+          "description": "The IP address or hostname of the Puppet Language Server to connect to"
         },
         "puppet.languageserver.port": {
           "type": "integer",
           "default": 8081,
-          "description": "The port of the VSCode languge sever to connect to"
-        },
-        "puppet.languageserver.stopOnClientExit": {
-          "type":"boolean",
-          "default": true,
-          "description": "Stop the VSCode languge sever when the client disconnects"
+          "description": "The TCP Port of the Puppet Language Server to connect to"
         },
         "puppet.languageserver.timeout": {
           "type": "integer",
           "default": 10,
-          "description": "The timeout to connect to the VSCode languge sever"
+          "description": "The timeout to connect to the local Puppet Language Server"
         },
         "puppet.languageserver.preLoadPuppet": {
           "type":"boolean",
           "default": true,
-          "description": "Initalize puppet on VSCode languge start"
+          "description": "Initalize Puppet and Facter when local Puppet Language Server starts"
+        },
+        "puppet.languageserver.debugFilePath": {
+          "type":"string",
+          "default": "",
+          "description": "Set the local Puppet Language Server to send debug information to a file"
         }
       }
     }

client/src/connection.ts

@@ -27,9 +27,9 @@ export interface IConnectionConfiguration {
   type: ConnectionType;
   host: string;
   port: number;
-  stopOnClientExit: string;
-  timeout: string;
-  preLoadPuppet: string;
+  timeout: number;
+  preLoadPuppet: boolean;
+  debugFilePath: string;
 }
 
 export interface IConnectionManager {
@@ -223,6 +223,18 @@ export class ConnectionManager implements IConnectionManager {
       return;
     }
 
+    if ((this.connectionConfiguration.host == undefined) || (this.connectionConfiguration.host == '')) {
+      args.push('--ip=127.0.0.1');
+    } else {
+      args.push('--ip=' + this.connectionConfiguration.host);
+    }
+    args.push('--port=' + this.connectionConfiguration.port);
+    args.push('--timeout=' + this.connectionConfiguration.timeout);
+    if (this.connectionConfiguration.preLoadPuppet == false) { args.push('--no-preload'); }
+    if ((this.connectionConfiguration.debugFilePath != undefined) && (this.connectionConfiguration.debugFilePath != '')) {
+      args.push('--debug=' + this.connectionConfiguration.debugFilePath);
+    }
+
     console.log("Starting the language server with " + cmd + " " + args.join(" "));
     myOutputChannel.appendLine("Starting the language server with " + cmd + " " + args.join(" "));
     var proc = cp.spawn(cmd, args, options)

client/src/extension.ts

@@ -15,18 +15,18 @@ export class ConnectionConfiguration implements IConnectionConfiguration {
   public type: ConnectionType = ConnectionType.Unknown; 
   public host: string = undefined;
   public port: number = undefined;
-  public stopOnClientExit: string = undefined;
-  public timeout: string = undefined;
-  public preLoadPuppet: string = undefined;
+  public timeout: number = undefined;
+  public preLoadPuppet: boolean = undefined;
+  public debugFilePath: string = undefined;
 
   constructor(context: vscode.ExtensionContext) {
     let config = vscode.workspace.getConfiguration('puppet');
 
-    this.host             = config['languageserver']['address']; // '127.0.0.1';
-    this.port             = config['languageserver']['port']; // 8081;
-    this.stopOnClientExit = config['languageserver']['stopOnClientExit']; // true;
-    this.timeout          = config['languageserver']['timeout']; // 10;
-    this.preLoadPuppet    = config['languageserver']['preLoadPuppet']; // true;
+    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'];
   }
 }