Added VM Options config for notebooks, fixed enable preview failing with EA versions bug and added logger for knowing with which options the kernel is being launched

Author: Achal1607

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/NotebookConfigs.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates.
+ * Copyright (c) 2025-2026, Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,12 +39,14 @@ public class NotebookConfigs {
         "notebook.addmodules",
         "notebook.enablePreview",
         "notebook.implicitImports",
-        "notebook.projects.mapping"};
+        "notebook.projects.mapping",
+        "notebook.vmOptions"};
     private volatile String classPath = null;
     private volatile String modulePath = null;
     private volatile String addModules = null;
     private volatile boolean enablePreview = false;
     private volatile JsonObject notebookProjectMapping = new JsonObject();
+    private volatile List<String> notebookVmOptions = new ArrayList<>();
     private volatile List<String> implicitImports = null;
     private volatile CompletableFuture<Void> initialized;
 
@@ -76,6 +78,10 @@ public JsonObject getNotebookProjectMapping() {
         return notebookProjectMapping;
     }
 
+    public List<String> getNotebookVmOptions() {
+        return notebookVmOptions;
+    }
+
     private NotebookConfigs() {
 
     }
@@ -145,6 +151,11 @@ private CompletableFuture<Void> initializeConfigs() {
                     if (notebookProjectMappingConfig != null) {
                         notebookProjectMapping = notebookProjectMappingConfig;
                     }
+                    
+                    JsonArray notebookVmOptionsConfig = NotebookUtils.getArgument(c, 6, JsonArray.class);
+                    if (notebookVmOptionsConfig != null) {
+                        notebookVmOptions = notebookVmOptionsConfig.asList().stream().map(el -> el.getAsString()).toList();
+                    }
                 }
             });
 
@@ -154,7 +165,8 @@ private CompletableFuture<Void> initializeConfigs() {
     }
 
     public String getJdkVersion() {
-        return System.getProperty("java.version").split("\\.")[0];
+        // As per JEP-223
+        return System.getProperty("java.specification.version");
     }
 
     public void notebookConfigsChangeListener(JsonObject settings) {

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/NotebookSessionManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates.
+ * Copyright (c) 2025-2026, Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,12 +94,15 @@ private JShell jshellBuildWithProject(String notebookUri, Project prj, JshellStr
         List<String> compilerOptions = getCompilerOptions(prj);
         List<String> remoteOptions = getRemoteVmOptions(prj);
         setSystemPropertiesForRemoteVm(remoteOptions, notebookUri);
-
+        
         JShell.Builder builder = JShell.builder()
                 .out(streamsHandler.getPrintOutStream())
                 .err(streamsHandler.getPrintErrStream())
                 .in(streamsHandler.getInputStream());
 
+        LOG.log(Level.INFO, "Initializing Notebook kernel for {0}", notebookUri);
+        LOG.log(Level.INFO, "Compiler options being passed: {0}", compilerOptions.toString());
+        LOG.log(Level.INFO, "VM Options being passed to notebook kernel: {0}", remoteOptions.toString());
         if (!compilerOptions.isEmpty()) {
             builder.compilerOptions(compilerOptions.toArray(new String[0]))
                     .remoteVMOptions(remoteOptions.toArray(new String[0]));
@@ -226,6 +229,10 @@ private List<String> getRemoteVmOptions(Project prj) {
         if (enablePreview) {
             remoteOptions.add(ENABLE_PREVIEW);
         }
+        
+        List<String> extraVmOptions = NotebookConfigs.getInstance().getNotebookVmOptions();
+        remoteOptions.addAll(extraVmOptions);
+        
         return remoteOptions;
     }
 

nbcode/notebooks/test/unit/src/org/netbeans/modules/nbcode/java/notebook/NotebookConfigsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates.
+ * Copyright (c) 2025-2026 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,11 +37,6 @@
         2.Missing keys 
 */
 
-/*
-Version 1 21/08/25
-Version 2 25/09/25  Inline with frontend sending arrays for CP,MP,Add modules
-*/
-
 /**
  *  Mock LSP Client sending sample configurations
  *  Verifies that the NotebookConfigs class 
@@ -59,6 +54,7 @@ public class NotebookConfigsTest {
     private static final String ADD_MODULES_KEY = "jdk.notebook.addmodules";
     private static final String ENABLE_PREVIEW_KEY = "jdk.notebook.enablePreview";
     private static final String MODULEPATH_KEY = "jdk.notebook.modulepath";
+    private static final String VM_OPTIONS_KEY = "jdk.notebook.vmOptions";
 
     public NotebookConfigsTest() {
     }
@@ -173,24 +169,57 @@ public void testGetImplicitImports() {
             fail("Configuration initialization failed");
         }
     }
+    
+    /**
+    * Test of getNotebookVmOptions method, of class NotebookConfigs.
+    */
+   @Test
+   public void testGetNotebookVmOptions() {
+       System.out.println("getNotebookVmOptions");
+       try {
+           initialized.get(5, TimeUnit.SECONDS);
+
+           List<String> expResult = configsObj.get(VM_OPTIONS_KEY)
+                   .getAsJsonArray()
+                   .asList()
+                   .stream()
+                   .map(elem -> elem.getAsString())
+                   .toList();
+
+           List<String> result = instance.getNotebookVmOptions();
+
+           assertEquals(expResult, result);
+       } catch (Exception ex) {
+           fail("Configuration initialization failed");
+       }
+   }
 
     private void setConfigObject() {
         JsonArray imports = new JsonArray();
         imports.add(new JsonPrimitive("java.math.*"));
         imports.add(new JsonPrimitive("javafx.scene.control.*"));
         configsObj.add(IMPLICIT_IMPORTS_KEY, imports);
+        
         JsonArray classpath = new JsonArray();
         classpath.add(new JsonPrimitive(
                 "path/to/javafx-sdk-24.0.1/lib/javafx.base.jar"));
         configsObj.add(CLASSPATH_KEY, classpath);
+        
         JsonArray modulepath = new JsonArray();
         modulepath.add(new JsonPrimitive("/path/to/javafx-sdk/lib"));
         configsObj.add(MODULEPATH_KEY, modulepath);
         configsObj.add(ENABLE_PREVIEW_KEY, new JsonPrimitive(false));
+        
         JsonArray addModules = new JsonArray();
         addModules.add(new JsonPrimitive("javafx.controls"));
         addModules.add(new JsonPrimitive("javafx.graphics"));
         configsObj.add(ADD_MODULES_KEY, addModules);
+        
+        JsonArray vmOptions = new JsonArray();
+        vmOptions.add(new JsonPrimitive("--add-opens=java.base/java.lang=ALL-UNNAMED"));
+        vmOptions.add(new JsonPrimitive("--add-opens=java.base/java.util=ALL-UNNAMED"));
+        vmOptions.add(new JsonPrimitive("-Xmx2G"));
+        configsObj.add(VM_OPTIONS_KEY, vmOptions);
 
     }
 

vscode/package.json

@@ -331,6 +331,11 @@
 							"%jdk.configuration.inlay.enabled.enum.var.markdownDescription%"
 						]
 					}
+				},
+				"jdk.notebook.vmOptions": {
+					"description": "%jdk.configuration.notebook.vmOptions.description%",
+					"type": "array",
+					"default": []
 				}
 			}
 		},

vscode/package.nls.ja.json

@@ -78,6 +78,7 @@
     "jdk.notebook.implicitImports.description": "Javaノートブックで暗黙的にインポートする要素のリスト。空のときのデフォルトはjava.util、java.ioおよびjava.mathパッケージのスター・インポート。",
     "jdk.notebook.implicitImports.markdownDescription": "Javaノートブックで暗黙的にインポートする要素のリスト。空のときのデフォルトは`java.util`、`java.io`および`java.math`パッケージのスター・インポート。",
     "jdk.notebook.projects.mapping.description": "Javaノートブック・パスの、コンテキストを提供するプロジェクトのパスへのマッピング。",
+    "jdk.configuration.notebook.vmOptions.description": "The specific JVM options for use in Java notebooks. These options are added in addition to the project configuration, including class-path, module-path, preview features, and added modules.",
     "jdk.configuration.java.completion.commit.chars": "コード補完の提案の受入れをトリガーする文字を指定します。たとえば、ピリオド(.)を入力したときに提案を受け入れるには、これを[\".\"]に設定します",
     "jdk.initialConfigurations.launchJavaApp.name": "Javaアプリケーションの起動",
     "jdk.configurationSnippets.name": "Javaアプリケーションの起動",

vscode/package.nls.json

@@ -78,6 +78,7 @@
     "jdk.notebook.implicitImports.description": "List of elements to implicitly import in Java notebooks. Defaults to star-imports of java.util, java.io and java.math packages, when empty.",
     "jdk.notebook.implicitImports.markdownDescription": "List of elements to implicitly import in Java notebooks. Defaults to star-imports of `java.util`, `java.io` and `java.math` packages, when empty.",
     "jdk.notebook.projects.mapping.description": "Mapping of Java notebook paths to the path of the project that provides it context.",
+    "jdk.configuration.notebook.vmOptions.description": "The specific JVM options for use in Java notebooks. These options are added in addition to the project configuration, including class-path, module-path, preview features, and added modules.",
     "jdk.configuration.java.completion.commit.chars": "Specifies the characters that trigger accepting a code completion suggestion. For example, to accept suggestions when typing a dot (.), set this to [\".\"]",
     "jdk.initialConfigurations.launchJavaApp.name": "Launch Java App",
     "jdk.configurationSnippets.name": "Launch Java App",

vscode/package.nls.zh-cn.json

@@ -78,6 +78,7 @@
     "jdk.notebook.implicitImports.description": "要在 Java 记事本中隐式导入的元素列表。为空时，默认为 java.util、java.io 和 java.math 程序包的星型导入。",
     "jdk.notebook.implicitImports.markdownDescription": "要在 Java 记事本中隐式导入的元素列表。为空时，默认为 `java.util`、`java.io` 和 `java.math` 程序包的星型导入。",
     "jdk.notebook.projects.mapping.description": "将 Java 记事本路径映射到提供记事本上下文的项目的路径。",
+    "jdk.configuration.notebook.vmOptions.description": "The specific JVM options for use in Java notebooks. These options are added in addition to the project configuration, including class-path, module-path, preview features, and added modules.",
     "jdk.configuration.java.completion.commit.chars": "指定用于触发接受代码补全建议的字符。例如，要在键入点 (.) 时接受建议，请将该字符设为 [\".\"]",
     "jdk.initialConfigurations.launchJavaApp.name": "启动 Java 应用程序",
     "jdk.configurationSnippets.name": "启动 Java 应用程序",

vscode/src/configurations/configuration.ts

@@ -37,7 +37,8 @@ export const configKeys = {
     notebookEnablePreview: "notebook.enablePreview",
     notebookImplicitImports: "notebook.implicitImports",
     telemetryEnabled: 'telemetry.enabled',
-    notebookProjectMapping: "notebook.projects.mapping"
+    notebookProjectMapping: "notebook.projects.mapping",
+    notebookVmOptions: "notebook.vmOptions"
 };
 
 export const builtInConfigKeys = {
@@ -56,6 +57,7 @@ export const userConfigsListened: string[] = [
     appendPrefixToCommand(configKeys.notebookEnablePreview),
     appendPrefixToCommand(configKeys.notebookImplicitImports),
     appendPrefixToCommand(configKeys.notebookProjectMapping),
+    appendPrefixToCommand(configKeys.notebookVmOptions),
     builtInConfigKeys.vscodeTheme,
 ];