Merge pull request #56 from jpogran/start-lang-server-without-wait

(GH-7) Start lang server without wait

Author: jpogran

client/package.json

@@ -2,7 +2,7 @@
   "name": "puppet-vscode",
   "displayName": "Puppet",
   "description": "Puppet VSCode extension",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "publisher": "puppet",
   "license": "Apache 2.0",
   "icon":"images/Puppet-Logo-Amber-sm.png",
@@ -122,6 +122,7 @@
   "devDependencies": {
     "typescript": "^2.0.3",
     "vscode": "^1.0.0",
+    "vscode-languageclient": "^3.1.0",
     "vsce": "^1.18.0",
     "mocha": "^2.3.3",
     "gulp": "^3.9.1",
@@ -131,6 +132,8 @@
     "@types/mocha": "^2.2.32"
   },
   "dependencies": {
-    "vscode-languageclient": "^3.1.0"
+    "vscode": "^1.0.0",
+    "vscode-languageclient": "^3.1.0",
+    "vscode-languageserver": "^3.1.0"
   }
 }

client/src/extension.ts

@@ -1,30 +1,61 @@
 'use strict';
 
 import * as vscode from 'vscode';
+import * as path from 'path';
 
-import { startLangServerTCP } from '../src/languageserver';
+import { startLangServerTCP, createLanguageServerProcess } from '../src/languageserver';
 import { setupPuppetCommands } from '../src/puppetcommands';
 
 const langID = 'puppet'; // don't change this
 var statusBarItem;
 
 export function activate(context: vscode.ExtensionContext) {
-  let config = vscode.workspace.getConfiguration('puppet');
+  var myOutputChannel = vscode.window.createOutputChannel('Puppet');
+  myOutputChannel.show()
 
-  var host             = config['languageserver']['address']; // '127.0.0.1';
-  var port             = config['languageserver']['port']; // 8081;
-  var stopOnClientExit = config['languageserver']['stopOnClientExit']; // true;
-  var timeout          = config['languageserver']['timeout']; // 8081;
-  var preLoadPuppet    = config['languageserver']['preLoadPuppet']; // true;
+  try {
+    var contextPath = context.asAbsolutePath(path.join('vendor', 'languageserver', 'puppet-languageserver'));
 
-  createStatusBarItem();
+    let config = vscode.workspace.getConfiguration('puppet');
 
-  var languageServerClient = startLangServerTCP(host, port, langID, statusBarItem);
-  context.subscriptions.push(languageServerClient.start());
+    var host             = config['languageserver']['address']; // '127.0.0.1';
+    var port             = config['languageserver']['port']; // 8081;
+    var stopOnClientExit = config['languageserver']['stopOnClientExit']; // true;
+    var timeout          = config['languageserver']['timeout']; // 10;
+    var preLoadPuppet    = config['languageserver']['preLoadPuppet']; // true;
 
-  setupPuppetCommands(langID, languageServerClient, context);
+    createStatusBarItem();
 
-  console.log('Congratulations, your extension "vscode-puppet" is now active!');
+    var languageServerClient = null
+    if (host == '127.0.0.1' || host == 'localhost' || host == '') {
+      var serverProc = createLanguageServerProcess(contextPath, myOutputChannel);
+
+      serverProc.stdout.on('data', (data) => {
+        console.log("OUTPUT: " + data.toString());
+        myOutputChannel.appendLine("OUTPUT: " + data.toString());
+
+        languageServerClient = startLangServerTCP(host, port, langID, statusBarItem, myOutputChannel);
+        context.subscriptions.push(languageServerClient.start());
+      });
+
+      serverProc.on('close', (exitCode) => {
+        console.log("SERVER terminated with exit code: " + exitCode);
+        myOutputChannel.appendLine("SERVER terminated with exit code: " + exitCode);
+      });
+    }
+    else {
+      languageServerClient = startLangServerTCP(host, port, langID, statusBarItem, myOutputChannel);
+      context.subscriptions.push(languageServerClient.start());
+    }
+
+    setupPuppetCommands(langID, languageServerClient, context);
+
+    console.log('Congratulations, your extension "vscode-puppet" is now active!');
+    myOutputChannel.appendLine('Congratulations, your extension "vscode-puppet" is now active!');
+  } catch (e) {
+    console.log((<Error>e).message);//conversion to Error type
+    myOutputChannel.appendLine((<Error>e).message);
+  }
 }
 
 // this method is called when your extension is deactivated
@@ -47,4 +78,3 @@ export function createStatusBarItem() {
     })
   }
 }
-

client/src/languageserver.ts

@@ -1,14 +1,53 @@
-import {
-  LanguageClient, LanguageClientOptions, ServerOptions
-} from 'vscode-languageclient'
 import * as vscode from 'vscode';
 import * as net from 'net';
+import * as path from 'path';
 import * as cp from 'child_process';
 import ChildProcess = cp.ChildProcess;
+import {
+  LanguageClient, LanguageClientOptions, ServerOptions
+} from 'vscode-languageclient'
 
 import * as messages from '../src/messages';
 
-export function startLangServerTCP(host: string, port: number, langID: string, statusBarItem): LanguageClient {
+export function createLanguageServerProcess(serverExe: string, myOutputChannel: vscode.OutputChannel) {
+  myOutputChannel.appendLine('Language server found at: ' + serverExe)
+
+  let cmd = '';
+  let args = [serverExe];
+  let options = {};
+
+  // type Platform = 'aix'
+  //               | 'android'
+  //               | 'darwin'
+  //               | 'freebsd'
+  //               | 'linux'
+  //               | 'openbsd'
+  //               | 'sunos'
+  //               | 'win32';
+  switch (process.platform) {
+    case 'win32':
+      myOutputChannel.appendLine('Windows spawn process does not work at the moment')
+      vscode.window.showErrorMessage('Windows spawn process does not work at the moment. Functionality will be limited to syntax highlighting');
+      break;
+    default:
+      myOutputChannel.appendLine('Starting language server')
+      cmd = 'ruby'
+      options = {
+        shell: true,
+        env: process.env,
+        stdio: 'pipe',
+      };
+  }
+
+  var proc = cp.spawn(cmd, args, options)
+  console.log("ProcID = " + proc.pid);
+  myOutputChannel.appendLine('Language server PID:' + proc.pid)
+
+  return proc;
+}
+
+export function startLangServerTCP(host: string, port: number, langID: string, statusBarItem, myOutputChannel): LanguageClient {
+  myOutputChannel.appendLine('Configuring language server options')
   let serverOptions: ServerOptions = function () {
     return new Promise((resolve, reject) => {
       var client = new net.Socket();
@@ -21,13 +60,16 @@ export function startLangServerTCP(host: string, port: number, langID: string, s
     });
   }
 
+  myOutputChannel.appendLine('Configuring language server client options')
   let clientOptions: LanguageClientOptions = {
     documentSelector: [langID],
   }
 
+  myOutputChannel.appendLine('Starting language server client')
   var title = `tcp lang server (host ${host} port ${port})`;
   var languageServerClient = new LanguageClient(title, serverOptions, clientOptions)
   languageServerClient.onReady().then(() => {
+    myOutputChannel.appendLine('Language server client started, setting puppet version')
     languageServerClient.sendRequest(messages.PuppetVersionRequest.type).then((versionDetails) => {
       statusBarItem.color = "#affc74";
       statusBarItem.text = "$(terminal) " + versionDetails.puppetVersion;