Merge pull request #42 from Rodrigo-Barros/client-socket

Socket connection added to vscodeclient.

Author: dantleech

package.json

@@ -73,6 +73,26 @@
                     "type": "object",
                     "default": {},
                     "description": "Specifies the underlying Phpactor configuration."
+                },
+                "phpactor.remote.enabled":{
+                    "type":"boolean",
+                    "default":false,
+                    "description": "Connect to language server via socket instead stdio"
+                },
+                "phpactor.remote.host":{
+                    "type":"string",
+                    "default":"127.0.0.1",
+                    "description": "Host that language server is running"
+                },
+                "phpactor.remote.port":{
+                    "type":"integer",
+                    "default":9090,
+                    "description": "Port that language server is running"
+                },
+                "phpactor.launchServerArgs":{
+                    "type":"array",
+                    "default":[],
+                    "description": "Arguments passeds to language server. Only applies if language server is running in stdio mode"
                 }
             }
         }

src/extension.ts

@@ -2,12 +2,14 @@ import {
     LanguageClient,
     ServerOptions,
     LanguageClientOptions,
+    StreamInfo,
 } from "vscode-languageclient";
 
 import * as vscode from "vscode";
 import { spawn } from "child_process";
 import { existsSync, mkdir, mkdirSync } from "fs";
 import { basename, dirname } from "path";
+import * as net from 'net';
 
 const LanguageID = 'php';
 
@@ -35,21 +37,53 @@ export function deactivate() {
 	return languageClient.stop();
 }
 
+function getServerOptions(config): ServerOptions
+{
+    let serverOptions;
+    if(!config.remote.enabled)
+    {
+        // launch language server via stdio
+        serverOptions = {
+            run: {
+                command: config.path,
+                args: [
+                    "language-server",
+                    ...config.launchServerArgs
+                ]
+            },
+            debug: {
+                command: "phpactor",
+                args: [
+                    "language-server",
+                    ...config.launchServerArgs
+                ]
+            },
+        };
+    }
+    else{
+        // credits: https://github.com/itemis/xtext-languageserver-example/blob/master/vscode-extension/src/extension.ts
+        // launch language server via socket
+        serverOptions = () => {
+            let {host,port} = config.remote;
+            let socket = net.connect({
+                host,
+                port
+            });
+
+            let result = <StreamInfo>{
+                writer:socket,
+                reader:socket
+            };
+            
+            return Promise.resolve(result);
+        } 
+    }
+
+    return serverOptions;
+}
+
 function createClient(config: any): LanguageClient {
-    let serverOptions: ServerOptions = {
-        run: {
-            command: config.path,
-            args: [
-                "language-server"
-            ]
-        },
-        debug: {
-            command: "phpactor",
-            args: [
-                "language-server"
-            ]
-        },
-    };
+    let serverOptions = getServerOptions(config);
 
     let clientOptions: LanguageClientOptions = {
         documentSelector: [