Dedicated Java Runtime View (#154)

Author: akaroml

package.json

@@ -37,7 +37,9 @@
     "workspaceContains:mnvw",
     "onCommand:java.overview",
     "onCommand:java.showReleaseNotes",
-    "onWebviewPanel:java.overview"
+    "onWebviewPanel:java.overview",
+    "onCommand:java.runtime",
+    "onWebviewPanel:java.runtime"
   ],
   "contributes": {
     "commands": [
@@ -48,6 +50,10 @@
       {
         "command": "java.showReleaseNotes",
         "title": "Java: Show Release Notes"
+      },
+      {
+        "command": "java.runtime",
+        "title": "Java: Runtime"
       }
     ]
   },

src/commands/index.ts

@@ -6,6 +6,7 @@ import * as vscode from "vscode";
 import { instrumentCommand } from "../utils";
 import { createMavenProjectCmdHanlder, createSpringBootProjectCmdHandler, showExtensionCmdHandler, openUrlCmdHandler, showReleaseNotesHandler } from "./handler";
 import { overviewCmdHandler } from "../overview";
+import { javaRuntimeCmdHandler } from "../java-runtime";
 
 export function initialize(context: vscode.ExtensionContext) {
   context.subscriptions.push(vscode.commands.registerCommand("java.overview", instrumentCommand(context, "java.overview", instrumentCommand(context, "java.helper.overview", overviewCmdHandler))));
@@ -14,4 +15,5 @@ export function initialize(context: vscode.ExtensionContext) {
   context.subscriptions.push(vscode.commands.registerCommand("java.helper.showExtension", instrumentCommand(context, "java.helper.showExtension", showExtensionCmdHandler)));
   context.subscriptions.push(vscode.commands.registerCommand("java.helper.openUrl", instrumentCommand(context, "java.helper.openUrl", openUrlCmdHandler)));
   context.subscriptions.push(vscode.commands.registerCommand("java.showReleaseNotes", instrumentCommand(context, "java.showReleaseNotes", showReleaseNotesHandler)));
+  context.subscriptions.push(vscode.commands.registerCommand("java.runtime", instrumentCommand(context, "java.runtime", javaRuntimeCmdHandler)));
 }

src/extension.ts

@@ -9,7 +9,7 @@ import { initialize as initCommands } from "./commands";
 import { initialize as initRecommendations } from "./recommendation";
 import { initialize as initMisc, showReleaseNotesOnStart } from "./misc";
 import { showOverviewPageOnActivation, OverviewViewSerializer } from "./overview";
-import { validateJavaRuntime } from "./java-runtime";
+import { validateJavaRuntime, JavaRuntimeViewSerializer } from "./java-runtime";
 
 export async function activate(context: vscode.ExtensionContext) {
   initializeTelemetry(context);
@@ -23,6 +23,7 @@ async function initializeExtension(operationId: string, context: vscode.Extensio
   initMisc(context);
 
   context.subscriptions.push(vscode.window.registerWebviewPanelSerializer("java.overview", new OverviewViewSerializer()));
+  context.subscriptions.push(vscode.window.registerWebviewPanelSerializer("java.runtime", new JavaRuntimeViewSerializer()));
 
   await showOverviewPageOnActivation(context);
   await showReleaseNotesOnStart(context);

src/java-runtime/index.ts

@@ -9,6 +9,51 @@ import * as pathExists from "path-exists";
 import * as request from "request-promise-native";
 import findJavaHome = require("find-java-home");
 import architecture = require("arch");
+import { loadTextFromFile, getExtensionContext } from "../utils";
+
+let javaRuntimeView: vscode.WebviewPanel | undefined;
+
+export async function javaRuntimeCmdHandler(context: vscode.ExtensionContext, operationId: string) {
+  if (javaRuntimeView) {
+    javaRuntimeView.reveal();
+    return;
+  }
+
+  javaRuntimeView = vscode.window.createWebviewPanel("java.runtime", "Java Runtime", {
+    viewColumn: vscode.ViewColumn.One,
+  }, {
+    enableScripts: true,
+    enableCommandUris: true,
+    retainContextWhenHidden: true
+  });
+
+  await initializeJavaRuntimeView(context, javaRuntimeView, onDidDisposeWebviewPanel);
+}
+
+function onDidDisposeWebviewPanel() {
+  javaRuntimeView = undefined;
+}
+
+async function initializeJavaRuntimeView(context: vscode.ExtensionContext, webviewPanel: vscode.WebviewPanel, onDisposeCallback: () => void) {
+  webviewPanel.iconPath = vscode.Uri.file(path.join(context.extensionPath, "logo.lowres.png"));
+  const resourceUri = context.asAbsolutePath("./out/assets/java-runtime/index.html");
+  webviewPanel.webview.html = await loadTextFromFile(resourceUri);
+
+  context.subscriptions.push(webviewPanel.onDidDispose(onDisposeCallback));
+}
+
+export class JavaRuntimeViewSerializer implements vscode.WebviewPanelSerializer {
+  async deserializeWebviewPanel(webviewPanel: vscode.WebviewPanel, state: any) {
+    if (javaRuntimeView) {
+      javaRuntimeView.reveal();
+      webviewPanel.dispose();
+      return;
+    }
+
+    javaRuntimeView = webviewPanel;
+    initializeJavaRuntimeView(getExtensionContext(), webviewPanel, onDidDisposeWebviewPanel);
+  }
+}
 
 const isWindows = process.platform.indexOf("win") === 0;
 const JAVAC_FILENAME = path.join("bin", "javac" + (isWindows ? ".exe" : "")) ;

src/overview/index.ts

@@ -3,15 +3,12 @@
 
 import * as vscode from "vscode";
 
-import { readFile as fsReadFile } from "fs";
-import * as util from "util";
 import * as path from "path";
 
-const readFile = util.promisify(fsReadFile);
-
 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;
 const KEY_SHOW_WHEN_USING_JAVA = "showWhenUsingJava";
@@ -56,7 +53,8 @@ function onDidDisposeWebviewPanel() {
 
 async function initializeOverviewView(context: vscode.ExtensionContext, webviewPanel: vscode.WebviewPanel, onDisposeCallback: () => void) {
   webviewPanel.iconPath = vscode.Uri.file(path.join(context.extensionPath, "logo.lowres.png"));
-  webviewPanel.webview.html = await loadHtmlContent(context);
+  const resourceUri = context.asAbsolutePath("./out/assets/overview/index.html");
+  webviewPanel.webview.html = await loadTextFromFile(resourceUri);
 
   context.subscriptions.push(webviewPanel.onDidDispose(onDisposeCallback));
 
@@ -98,11 +96,6 @@ async function initializeOverviewView(context: vscode.ExtensionContext, webviewP
   }
 }
 
-async function loadHtmlContent(context: vscode.ExtensionContext) {
-  let buffer = await readFile(context.asAbsolutePath("./out/assets/overview/index.html"));
-  return buffer.toString();
-}
-
 export async function showOverviewPageOnActivation(context: vscode.ExtensionContext) {
   let showWhenUsingJava = context.globalState.get(KEY_SHOW_WHEN_USING_JAVA);
   if (showWhenUsingJava === undefined) {

src/utils/index.ts

@@ -2,6 +2,10 @@
 // Licensed under the MIT license.
 
 import * as vscode from "vscode";
+import { readFile as fsReadFile } from "fs";
+import * as util from "util";
+
+const readFile = util.promisify(fsReadFile);
 
 let extensionContext: vscode.ExtensionContext;
 
@@ -33,5 +37,10 @@ export function stringToTime(str: string) {
   return Date.parse(str);
 }
 
+export async function loadTextFromFile(resourceUri: string) {
+  let buffer = await readFile(resourceUri);
+  return buffer.toString();
+}
+
 export * from "./command";
 export * from "./release-notes";