From 777101750710f9aad12e752721ae3edbfa269a31 Mon Sep 17 00:00:00 2001
From: BoykoAlex <aboyko@pivotal.io>
Date: Tue, 10 Oct 2017 21:50:16 -0400
Subject: [PATCH] Fix regression with JAR servers

---
 atom-extensions/atom-boot-java/package.json             | 2 +-
 atom-extensions/atom-bosh/package.json                  | 2 +-
 atom-extensions/atom-cf-manifest-yaml/package.json      | 2 +-
 atom-extensions/atom-commons/lib/jar-language-client.js | 5 ++++-
 atom-extensions/atom-commons/package.json               | 2 +-
 atom-extensions/atom-concourse/package.json             | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/atom-extensions/atom-boot-java/package.json b/atom-extensions/atom-boot-java/package.json
index 456f03dfa..f0dd9164f 100644
--- a/atom-extensions/atom-boot-java/package.json
+++ b/atom-extensions/atom-boot-java/package.json
@@ -17,7 +17,7 @@
   "dependencies": {
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.13"
+    "pivotal-atom-languageclient-commons": "0.0.14"
   },
   "devDependencies": {
     "coffeelint": "^1.10.1"
diff --git a/atom-extensions/atom-bosh/package.json b/atom-extensions/atom-bosh/package.json
index d871bcd6f..466fa2f89 100644
--- a/atom-extensions/atom-bosh/package.json
+++ b/atom-extensions/atom-bosh/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.13"
+    "pivotal-atom-languageclient-commons": "0.0.14"
   },
   "configSchema": {
     "bosh": {
diff --git a/atom-extensions/atom-cf-manifest-yaml/package.json b/atom-extensions/atom-cf-manifest-yaml/package.json
index b52286b29..a812e3012 100644
--- a/atom-extensions/atom-cf-manifest-yaml/package.json
+++ b/atom-extensions/atom-cf-manifest-yaml/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.13"
+    "pivotal-atom-languageclient-commons": "0.0.14"
   },
   "devDependencies": {
     "coffeelint": "^1.10.1"
diff --git a/atom-extensions/atom-commons/lib/jar-language-client.js b/atom-extensions/atom-commons/lib/jar-language-client.js
index 0454f9d77..416f70e82 100644
--- a/atom-extensions/atom-commons/lib/jar-language-client.js
+++ b/atom-extensions/atom-commons/lib/jar-language-client.js
@@ -113,8 +113,11 @@ export class JarLanguageClient extends AutoLanguageClient {
             '-Dlsp.lazy.completions.disable=true',
             '-Dlsp.completions.indentation.enable=true',
             '-Dlsp.yaml.completions.errors.disable=true',
-            launcher.endsWith('.jar') ? `-jar ${launcher}` : launcher,
         ]);
+        if (launcher.endsWith('.jar')) {
+            vmArgs.push('-jar');
+        }
+        vmArgs.push(launcher);
         this.logger.debug(`starting "${javaExecutable} ${vmArgs.join('\n')}"`);
         return cp.spawn(javaExecutable, vmArgs, { cwd: this.serverHome })
     }
diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json
index a5de692c3..c83e68c43 100644
--- a/atom-extensions/atom-commons/package.json
+++ b/atom-extensions/atom-commons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pivotal-atom-languageclient-commons",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "Atom language client commons for STS4 language servers",
   "repository": "https://github.com/spring-projects/sts4",
   "license": "MIT",
diff --git a/atom-extensions/atom-concourse/package.json b/atom-extensions/atom-concourse/package.json
index 8fef38097..15b6bb7ef 100644
--- a/atom-extensions/atom-concourse/package.json
+++ b/atom-extensions/atom-concourse/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.13"
+    "pivotal-atom-languageclient-commons": "0.0.14"
   },
   "devDependencies": {
     "coffeelint": "^1.10.1"