From 9bc0c209375cc3075a61b2f979fc14e278bf7594 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Thu, 22 Mar 2018 12:26:14 -0700
Subject: [PATCH] Revert "Disable JDT LS classpath support"

This reverts commit 07b7c313f40b9a579184f77b1e142768a8937c19.
---
 .../spring-boot-language-server/build.sh              |  1 +
 .../ide/vscode/boot/BootLanguageServerParams.java     |  6 +++---
 vscode-extensions/vscode-spring-boot/lib/Main.ts      |  2 +-
 vscode-extensions/vscode-spring-boot/package.json     |  2 +-
 .../vscode-spring-boot/scripts/preinstall.sh          | 11 +++++------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/headless-services/spring-boot-language-server/build.sh b/headless-services/spring-boot-language-server/build.sh
index 995aac236..8a882147a 100755
--- a/headless-services/spring-boot-language-server/build.sh
+++ b/headless-services/spring-boot-language-server/build.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 ../mvnw \
+    -Dmaven.test.skip=true \
     -f ../pom.xml \
     -pl spring-boot-language-server \
     -am \
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServerParams.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServerParams.java
index 3beb78b9a..2b9f67f73 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServerParams.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServerParams.java
@@ -81,8 +81,8 @@ public class BootLanguageServerParams {
 		return (SimpleLanguageServer server) -> {
 			// Initialize project finders, project caches and project observers
 			CompositeJavaProjectFinder javaProjectFinder = new CompositeJavaProjectFinder();
-			// JdtLsProjectCache jdtProjectCache = new JdtLsProjectCache(server);
-			// javaProjectFinder.addJavaProjectFinder(jdtProjectCache);
+			JdtLsProjectCache jdtProjectCache = new JdtLsProjectCache(server);
+			javaProjectFinder.addJavaProjectFinder(jdtProjectCache);
 			
 			MavenProjectCache mavenProjectCache = new MavenProjectCache(server, MavenCore.getDefault(), true, Paths.get(IJavaProject.PROJECT_CACHE_FOLDER));
 			javaProjectFinder.addJavaProjectFinder(new MavenProjectFinder(mavenProjectCache));
@@ -90,7 +90,7 @@ public class BootLanguageServerParams {
 			GradleProjectCache gradleProjectCache = new GradleProjectCache(server, GradleCore.getDefault(), true, Paths.get(IJavaProject.PROJECT_CACHE_FOLDER));
 			javaProjectFinder.addJavaProjectFinder(new GradleProjectFinder(gradleProjectCache));
 
-			CompositeProjectOvserver projectObserver = new CompositeProjectOvserver(Arrays.asList(/*jdtProjectCache,*/ mavenProjectCache, gradleProjectCache));
+			CompositeProjectOvserver projectObserver = new CompositeProjectOvserver(Arrays.asList(jdtProjectCache, mavenProjectCache, gradleProjectCache));
 			
 			DefaultSpringPropertyIndexProvider indexProvider = new DefaultSpringPropertyIndexProvider(javaProjectFinder, projectObserver);
 			indexProvider.setProgressService(server.getProgressService());
diff --git a/vscode-extensions/vscode-spring-boot/lib/Main.ts b/vscode-extensions/vscode-spring-boot/lib/Main.ts
index 6673402a2..07de35d22 100644
--- a/vscode-extensions/vscode-spring-boot/lib/Main.ts
+++ b/vscode-extensions/vscode-spring-boot/lib/Main.ts
@@ -20,7 +20,7 @@ const JAVA_LANGUAGE_ID = "java";
 export function activate(context: VSCode.ExtensionContext) {
     let options : commons.ActivatorOptions = {
         DEBUG: false,
-        CONNECT_TO_LS: false,
+        CONNECT_TO_LS: true,
         extensionId: 'vscode-spring-boot',
         preferJdk: true,
         checkjvm: (context: VSCode.ExtensionContext, jvm: commons.JVM) => {
diff --git a/vscode-extensions/vscode-spring-boot/package.json b/vscode-extensions/vscode-spring-boot/package.json
index 4838e17f9..303dd936b 100644
--- a/vscode-extensions/vscode-spring-boot/package.json
+++ b/vscode-extensions/vscode-spring-boot/package.json
@@ -31,7 +31,7 @@
     "onLanguage:java"
   ],
   "contributes": {
-    "DISABLED_javaExtensions": [
+    "javaExtensions": [
       "./jars/jdt-ls-extension.jar"
     ],
     "languages": [
diff --git a/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh b/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
index 8133ee58d..0c8825b90 100755
--- a/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
@@ -15,13 +15,12 @@ curl https://raw.githubusercontent.com/textmate/java.tmbundle/master/Syntaxes/Ja
 rm -fr ${workdir}/jars
 mkdir -p ${workdir}/jars
 
-# DISABLED in master for now:
 # Use maven to build jdt ls extension
-#cd ../../headless-services/org.springframework.tooling.jdt.ls.extension
-#../mvnw \
-#    -Djdt.ls.updatesite=file://${HOME}/git/eclipse.jdt.ls/org.eclipse.jdt.ls.repository/target/repository\
-#    clean package
-#cp target/*.jar ${workdir}/jars/jdt-ls-extension.jar
+cd ../../headless-services/org.springframework.tooling.jdt.ls.extension
+../mvnw \
+    -Djdt.ls.updatesite=file://${HOME}/git/eclipse.jdt.ls/org.eclipse.jdt.ls.repository/target/repository\
+    clean package
+cp target/*.jar ${workdir}/jars/jdt-ls-extension.jar
 
 # Use maven to build fat jar of the language server
 cd ../../headless-services/spring-boot-language-server