Improved logics for finding JVM / JDK in vscode-boot-java

vscode-extensions/vscode-boot-java/.vscode/launch.json

@@ -1,31 +1,17 @@
 // A launch configuration that compiles the extension and then opens it inside a new window
 {
-	"version": "0.1.0",
-	"configurations": [
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "Launch Extension",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"--extensionDevelopmentPath=${workspaceRoot}"
-			],
-			"sourceMaps": true,
-			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
-			],
-			"preLaunchTask": "npm"
-		},
-		{
-			"name": "Launch Tests",
-			"type": "extensionHost",
-			"request": "launch",
-			"runtimeExecutable": "${execPath}",
-			"args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ],
-			"stopOnEntry": false,
-			"sourceMaps": true,
-			"outFiles": ["${workspaceRoot}/out/test"],
-			"preLaunchTask": "npm"
-		}
-	]
-}
+    "version": "0.1.0",
+    "configurations": [
+        {
+            "name": "Extension",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
+            "stopOnEntry": true,
+            "sourceMaps": true,
+            "outFiles": [ "${workspaceRoot}/out/**/*.js" ],
+            "preLaunchTask": "npm: watch"
+        }
+    ]
+}

vscode-extensions/vscode-boot-java/.vscode/tasks.json

@@ -1,30 +1,20 @@
-// Available variables which can be used inside of strings.
-// ${workspaceRoot}: the root folder of the team
-// ${file}: the current opened file
-// ${fileBasename}: the current opened file's basename
-// ${fileDirname}: the current opened file's dirname
-// ${fileExtname}: the current opened file's extension
-// ${cwd}: the current working directory of the spawned process
-
-// A task runner that calls a custom npm script that compiles the extension.
+// See https://go.microsoft.com/fwlink/?LinkId=733558
+// for the documentation about the tasks.json format
 {
-	"version": "0.1.0",
-
-	// we want to run npm
-	"command": "npm",
-
-	// the command is a shell script
-	"isShellCommand": true,
-
-	// show the output window only if unrecognized errors occur.
-	"showOutput": "silent",
-
-	// we run the custom script "compile" as defined in package.json
-	"args": ["run", "compile"], //, "--loglevel", "silent"],
-
-	// The tsc compiler is started in watching mode
-	"isWatching": true,
-
-	// use the standard tsc in watch mode problem matcher to find compile problems in the output.
-	"problemMatcher": "$tsc-watch"
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "type": "npm",
+            "script": "watch",
+            "problemMatcher": "$tsc-watch",
+            "isBackground": true,
+            "presentation": {
+                "reveal": "never"
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
 }

vscode-extensions/vscode-boot-java/lib/Main.ts

@@ -1,6 +1,4 @@
 'use strict';
-// The module 'vscode' contains the VS Code extensibility API
-// Import the module and reference it with the alias vscode in your code below
 
 import * as net from 'net';
 
@@ -14,28 +12,25 @@ import { workspace, TextDocument } from 'vscode';
 import { Trace } from 'vscode-jsonrpc';
 
 import * as commons from 'commons-vscode';
+import { connect } from 'tls';
 
 export function activate(context: VSCode.ExtensionContext) {
-
     let options: commons.ActivatorOptions = {
         DEBUG: false,
         CONNECT_TO_LS: false,
         extensionId: 'boot-java',
         launcher: (context: VSCode.ExtensionContext) => 'org.springframework.boot.loader.JarLauncher',
-        classpath: (context: VSCode.ExtensionContext, javaVersion: number) => {
+        classpath: (context: VSCode.ExtensionContext, jvm: commons.JVM) => {
             const classpath = [
                 Path.resolve(context.extensionPath, 'jars/language-server.jar')
             ];
-
-            if (javaVersion < 9) {
-                const toolsJar = commons.findJvmFile('lib', 'tools.jar');
-                if (toolsJar) {
-                    classpath.push(toolsJar);
-                } else {
-                    VSCode.window.showWarningMessage('JAVA_HOME environment variable points either to JRE or JDK missing "lib/tools.jar" hence Boot Hints are unavailable');
-                }
+            if (!jvm.isJdk()) {
+                VSCode.window.showWarningMessage('JAVA_HOME or PATH environment variable seems to point to a JRE. A JDK is required, hence Boot Hints are unavailable.');
+            }
+            const toolsJar = jvm.getToolsJar();
+            if (toolsJar) {
+                classpath.unshift(toolsJar);
             }
-
             return classpath;
         },
         clientOptions: {

vscode-extensions/vscode-boot-java/scripts/preinstall.sh

@@ -8,9 +8,9 @@ workdir=`pwd`
 npm install ../commons-vscode/commons-vscode-*.tgz
 
 # Use maven to build fat jar of the language server
-cd ../../headless-services/boot-java-language-server
-./build.sh
+#cd ../../headless-services/boot-java-language-server
+#./build.sh
 
-mkdir -p ${workdir}/jars
-cp target/*.jar ${workdir}/jars/language-server.jar
+# mkdir -p ${workdir}/jars
+# cp target/*.jar ${workdir}/jars/language-server.jar