Include microprofile.ls and quarkus.ls.ext jar (#253)

Signed-off-by: Ryan Zegray <[email protected]>

Author: rzgry

gulpfile.js

@@ -15,18 +15,34 @@ const gulp = require('gulp');
 const rename = require('gulp-rename');
 const cp = require('child_process');
 
-const serverName = 'com.redhat.microprofile.ls-uber.jar';
+const microprofileServerName = 'com.redhat.microprofile.ls-uber.jar';
 const extensions = ['com.redhat.microprofile.jdt.core', 'com.redhat.microprofile.jdt.quarkus'];
-const serverDir = '../quarkus-ls/microprofile.ls/com.redhat.microprofile.ls';
+const microprofileServerDir = '../quarkus-ls/microprofile.ls/com.redhat.microprofile.ls';
 const extensionDir = '../quarkus-ls/microprofile.jdt';
 
-gulp.task('buildServer', (done) => {
-  cp.execSync(mvnw() + ' clean verify -DskipTests', { cwd: serverDir , stdio: 'inherit' });
-  gulp.src(serverDir + '/target/' + serverName)
+const quarkusServerExtGlob = 'com.redhat.quarkus.ls!(*-sources).jar';
+const quarkusServerExtDir = '../quarkus-ls/quarkus.ls.ext/com.redhat.quarkus.ls'
+
+gulp.task('buildMicroProfileServer', (done) => {
+  cp.execSync(mvnw() + ' clean install -DskipTests', { cwd: microprofileServerDir , stdio: 'inherit' });
+  gulp.src(microprofileServerDir + '/target/' + microprofileServerName)
     .pipe(gulp.dest('./server'));
   done();
 });
 
+gulp.task('buildQuarkusServerExt', (done) => {
+  cp.execSync(mvnw() + ' clean verify -DskipTests', { cwd: quarkusServerExtDir , stdio: 'inherit' });
+  gulp.src(quarkusServerExtDir + '/target/' + quarkusServerExtGlob)
+    .pipe(gulp.dest('./server'));
+  // copy over any dependencies not provided by mp-ls 
+  // dependencies are copied into /target/lib by the maven-dependency-plugin
+  gulp.src(quarkusServerExtDir + '/target/lib/*.jar')
+    .pipe(gulp.dest('./server'));
+  done();
+});
+
+gulp.task('buildServer', gulp.series(['buildMicroProfileServer', 'buildQuarkusServerExt']))
+
 gulp.task('buildExtension', (done) => {
   cp.execSync(mvnw() + ' -pl "' + extensions.join(',') + '" clean verify -DskipTests' , { cwd: extensionDir, stdio: 'inherit' });
   extensions.forEach(extension => {

src/languageServer/javaServerStarter.ts

@@ -7,7 +7,9 @@ const glob = require('glob');
 
 const DEBUG = startedInDebugMode();
 const DEBUG_PORT = 1064;
-const SERVER_NAME = 'com.redhat.microprofile.ls-uber.jar';
+const MICROPROFILE_SERVER_NAME = 'com.redhat.microprofile.ls-uber.jar';
+const QUARKUS_SERVER_EXTENSION_GLOB = 'com.redhat.quarkus.ls*.jar';
+const MICROPROFILE_SERVER_MAIN_CLASS = 'com.redhat.microprofile.ls.MicroProfileServerLauncher';
 
 export function prepareExecutable(requirements: RequirementsData): Executable {
   const executable: Executable = Object.create(null);
@@ -37,9 +39,14 @@ function prepareParams(): string[] {
   }
   parseVMargs(params, vmargs);
   const serverHome: string = path.resolve(__dirname, '../server');
-  const launchersFound: Array<string> = glob.sync(`**/${SERVER_NAME}`, { cwd: serverHome });
-  if (launchersFound.length) {
-    params.push('-jar'); params.push(path.resolve(serverHome, launchersFound[0]));
+  const microprofileServerFound: Array<string> = glob.sync(`**/${MICROPROFILE_SERVER_NAME}`, { cwd: serverHome });
+  const quarkusServerExtFound: Array<string> = glob.sync(`**/${QUARKUS_SERVER_EXTENSION_GLOB}`, { cwd: serverHome });
+  if (microprofileServerFound.length && quarkusServerExtFound.length) {
+    params.push('-cp');
+    params.push(`${serverHome}/*`);
+    params.push(MICROPROFILE_SERVER_MAIN_CLASS);
+  } else {
+    throw new Error('Unable to find required Language Server JARs');
   }
   return params;
 }