Remove java runtime from overview (#175)

* Remove java runtime from overview

Signed-off-by: Rome Li <[email protected]>

* Resolve comments

Signed-off-by: Rome Li <[email protected]>

Author: akaroml

src/extension.ts

@@ -29,7 +29,7 @@ async function initializeExtension(operationId: string, context: vscode.Extensio
   await showReleaseNotesOnStart(context);
 
   if (!await validateJavaRuntime()) {
-    vscode.commands.executeCommand("java.overview");
+    vscode.commands.executeCommand("java.runtime");
   }
 }
 

src/java-runtime/assets/java.runtime.entries.tsx

@@ -5,15 +5,23 @@ import * as React from "react";
 import { JavaRuntimeEntry } from "../types";
 
 export const JavaRuntimeEntryPanel = (props: JavaRuntimeEntry[]) => {
-  const current = props.findIndex(entry => entry.isValid || false);
+  const currentIndex = props.findIndex(entry => !!entry.path);
+  let errorIndex = -1;
+  if (currentIndex !== -1 && !props[currentIndex].isValid) {
+    errorIndex = currentIndex;
+  }
+
   const entries = props.map((entry, index) =>
-    <tr>
+    <tr key={index}>
       <th scope="row">{index + 1}</th>
       <td>
-        {!entry.path && <em>*Empty*</em>}
+        {!entry.path && <em>{"<Empty>"}</em>}
         {entry.path}
-        {index === current && <span className="badge badge-pill badge-primary">Current</span>}
-        {entry.path && !entry.isValid && <span className="badge badge-pill badge-secondary" title={entry.hint}>Invalid</span>}
+        &nbsp;
+        {index === currentIndex && errorIndex === -1 && <span className="badge badge-pill badge-primary">Current</span>}
+        {entry.path && !entry.isValid && errorIndex === -1 && <span className="badge badge-pill badge-secondary" title={entry.hint}>Invalid</span>}
+        {entry.path && errorIndex === index && <span className="badge badge-pill badge-danger" title={entry.hint}>Error</span>}
+        {!!entry.path && !!entry.hint && <div><em className={errorIndex === index ? "text-danger" : "text-warning"}>{entry.hint}</em></div>}
       </td>
       <td>
         {entry.name}

src/java-runtime/index.ts

@@ -167,6 +167,12 @@ async function checkJdkInstallation(javaHome: string | undefined) {
 
 export async function validateJavaRuntime() {
   const entries = await findJavaRuntimeEntries();
+  // Java LS uses the first non-empty path to locate the JDK
+  const currentPathIndex = entries.findIndex(entry => !_.isEmpty(entry.path));
+  if (currentPathIndex !== -1) {
+    return entries[currentPathIndex].isValid;
+  }
+
   return _.some(entries, entry => entry.isValid);
 }
 
@@ -175,14 +181,18 @@ export async function findJavaRuntimeEntries(): Promise<JavaRuntimeEntry[]> {
   return Promise.all(_.map(entries, async entry => {
     if (!await checkJdkInstallation(entry.path)) {
       entry.isValid = false;
-      entry.hint = "This path does not point to a JDK.";
+      entry.hint = "This path is not pointing to a JDK.";
+      const pathObject = path.parse(entry.path||"");
+      if (pathObject.name && pathObject.name.toLowerCase() === "bin") {
+        entry.hint += " Try remove the \"bin\" from the path.";
+      }
       return entry;
     }
 
     const version = await getJavaVersion(entry.path);
     if (version < MIN_JDK_VERSION) {
       entry.isValid = false;
-      entry.hint = `JDK 8+ is required while the path points to ${version}`;
+      entry.hint = `JDK 8+ is required while the path is pointing to version ${version}`;
       return entry;
     }
 

src/overview/assets/index.ts

@@ -4,36 +4,16 @@
 import $ = require("jquery");
 import "../../assets/vscode.scss";
 import "bootstrap/js/src/tab";
-import bytes = require("bytes");
 
 window.addEventListener("message", event => {
   if (event.data.command === "syncExtensionVisibility") {
     syncExtensionVisibility(event.data.installedExtensions);
     syncSectionVisibility();
   } else if (event.data.command === "setOverviewVisibility") {
     $("#showWhenUsingJava").prop("checked", event.data.visibility);
-  } else if (event.data.command === "showJavaRuntimePanel") {
-    $("#javaRuntimePanel").removeClass("d-none");
-  } else if (event.data.command === "applyJdkInfo") {
-    applyJdkInfo(event.data.jdkInfo);
   }
 });
 
-function applyJdkInfo(jdkInfo: any) {
-  let binary = jdkInfo.binaries[0];
-  let downloadLink = binary.installer_link || binary.binary_link;
-  $("#jdkOs").text(binary.os);
-  $("#jdkArch").text(binary.architecture);
-  $("#jdkReleaseName").text(jdkInfo.release_name);
-  $("#jdkDownloadSize").text(bytes(binary.binary_size, {unitSeparator: " "}));
-
-  let encodedLink = `command:java.helper.openUrl?${encodeURIComponent(JSON.stringify(downloadLink))}`;
-  $("#jdkDownloadLink").attr("href", encodedLink);
-
-  $("#jdkSpinner").addClass("d-none");
-  $("#jdkDownloadLink").removeClass("d-none");
-}
-
 function syncExtensionVisibility(extensions: any) {
   $("div[ext]").each((index, elem) => {
     const anchor = $(elem);
@@ -66,14 +46,6 @@ $("#showWhenUsingJava").change(function () {
   });
 });
 
-function requestJdkInfo(jdkVersion: string, jvmImpl: string) {
-  vscode.postMessage({
-    command: "requestJdkInfo",
-    jdkVersion: jdkVersion,
-    jvmImpl: jvmImpl
-  });
-}
-
 function installExtension(extName: string, displayName: string) {
   vscode.postMessage({
     command: "installExtension",
@@ -85,9 +57,3 @@ function installExtension(extName: string, displayName: string) {
 $("div[ext]").click(function () {
   installExtension($(this).attr("ext"), $(this).attr("displayName"));
 });
-
-$("input[type=radio]").change(() => {
-  $("#jdkSpinner").removeClass("d-none");
-  $("#jdkDownloadLink").addClass("d-none");
-  requestJdkInfo($("input[name=jdkVersion]:checked").val() + "", $("input[name=jvmImpl]:checked").val() + "");
-});

src/overview/index.ts

@@ -7,7 +7,6 @@ import * as path from "path";
 
 import { instrumentOperation, sendInfo } from "vscode-extension-telemetry-wrapper";
 import { getExtensionContext } from "../utils";
-import { validateJavaRuntime, suggestOpenJdk } from "../java-runtime";
 import { loadTextFromFile } from "../utils";
 
 let overviewView: vscode.WebviewPanel | undefined;
@@ -80,29 +79,10 @@ async function initializeOverviewView(context: vscode.ExtensionContext, webviewP
   context.subscriptions.push(webviewPanel.webview.onDidReceiveMessage(async (e) => {
     if (e.command === "setOverviewVisibility") {
       toggleOverviewVisibilityOperation(context, e.visibility);
-    } else if (e.command === "requestJdkInfo") {
-      let jdkInfo = await suggestOpenJdk(e.jdkVersion, e.jvmImpl);
-      applyJdkInfo(jdkInfo);
     } else if (e.command === "installExtension") {
       await vscode.commands.executeCommand("java.helper.installExtension", e.extName, e.displayName);
     }
   }));
-
-  if (!await validateJavaRuntime()) {
-    webviewPanel.webview.postMessage({
-      command: "showJavaRuntimePanel",
-    });
-
-    let jdkInfo = await suggestOpenJdk();
-    applyJdkInfo(jdkInfo);
-  }
-
-  function applyJdkInfo(jdkInfo: any) {
-    webviewPanel.webview.postMessage({
-      command: "applyJdkInfo",
-      jdkInfo: jdkInfo
-    });
-  }
 }
 
 export async function showOverviewPageOnActivation(context: vscode.ExtensionContext) {