Merge branch 'merge_main_20250826' into 'main'

Merge 'oracle:main' as on 2025-08-26

See merge request oci-jpg-jvsce/javavscode-cpu!3

Author: sid-srini

build.xml

@@ -64,6 +64,7 @@
             patches/8460-draft.diff
             patches/8470.diff
             patches/8484.diff
+            patches/8745-draft.diff
             patches/disable-error-notification.diff
             patches/mvn-sh.diff
             patches/project-marker-jdk.diff

nbcode/integration/src/org/netbeans/modules/nbcode/integration/LspJavaPlatformProviderOverride.java

@@ -28,4 +28,8 @@
  */
 @ServiceProvider(service = JavaPlatformProvider.class, position = 10_000)
 public class LspJavaPlatformProviderOverride extends AbstractJavaPlatformProviderOverride {
+
+    public LspJavaPlatformProviderOverride() {
+        super(System.getProperty("netbeans.lsp.java.platform.override", null)); //NOI18N
+    }
 }

nbcode/telemetry/src/org/netbeans/modules/nbcode/java/lsp/server/telemetry/SourceInfo.java

@@ -20,7 +20,10 @@
 import java.lang.ref.WeakReference;
 import java.net.URI;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.tools.JavaFileObject;
 import javax.tools.SimpleJavaFileObject;
 import org.eclipse.lsp4j.services.LanguageClient;
@@ -38,7 +41,7 @@
 import org.openide.util.Lookup;
 
 class SourceInfo {
-
+    private static final Logger LOG = Logger.getLogger(SourceInfo.class.getName());
     private final FileObject file;
     private final Project owner;
     final JavaFileObject source;
@@ -108,10 +111,15 @@ public String getJavaVersion() {
         return LspServerTelemetryManager.getJavaRuntimeVersion(lookupFunction);
     }
 
-    public boolean getPreviewEnabled() {
-        return LspServerTelemetryManager.getInstance().isPreviewEnabled(file,
-                owner == null ? LspServerTelemetryManager.ProjectType.standalone : LspServerTelemetryManager.getInstance().getProjectType(owner),
-                getLanguageClient());
+    public boolean getPreviewEnabled(){
+        try {
+            return LspServerTelemetryManager.getInstance().isPreviewEnabled(file,
+                    owner,
+                    getLanguageClient()).get();
+        } catch (InterruptedException | ExecutionException ex) {
+            LOG.log(Level.FINE, "exception while checking if preview enabled: {0}", (Object) ex);
+        }
+        return false;
     }
 
     public static SourceInfo getSourceObject(ErrorProvider.Context context) {

patches/8745-draft.diff

@@ -0,0 +1,19 @@
+diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractJavaPlatformProviderOverride.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractJavaPlatformProviderOverride.java
+index df668954dd..054f85d0e5 100644
+--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractJavaPlatformProviderOverride.java
++++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractJavaPlatformProviderOverride.java
+@@ -39,6 +39,14 @@ public abstract class AbstractJavaPlatformProviderOverride implements JavaPlatfo
+     private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+     private FileObject defaultPlatformOverride;
+ 
++    public AbstractJavaPlatformProviderOverride() {
++        this(null);
++    }
++
++    protected AbstractJavaPlatformProviderOverride(String defaultPlatformOverride) {
++        this.defaultPlatformOverride = defaultPlatformOverride == null ? null : FileUtil.toFileObject(new File(defaultPlatformOverride));
++    }
++
+     @Override
+     @SuppressWarnings("ReturnOfCollectionOrArrayField")
+     public JavaPlatform[] getInstalledPlatforms() {

patches/nb-telemetry.diff

@@ -22,6 +22,24 @@
     under the License.
 
 -->
+## Version 24.1.1
+### What's Changed
+
+#### Bug Fixes
+* Standalone run output correction [#448](https://github.com/oracle/javavscode/pull/448)
+* Fix run/debug/test due to launch-config clashes [#432](https://github.com/oracle/javavscode/pull/432)
+* Updated the JavaLangFeatures feature name extractor to work with JDK25+ EA [#451](https://github.com/oracle/javavscode/pull/451)
+* Constructor init of java.lsp.server JavaPlatformProvider override [#453](https://github.com/oracle/javavscode/pull/453)
+* Extension restart fix [#433](https://github.com/oracle/javavscode/pull/433)
+* Fix formatting issue when there is erroneous if tree [#429](https://github.com/oracle/javavscode/pull/429)
+* Fixed project clean and project compile commands in the command palette [#438](https://github.com/oracle/javavscode/pull/438)
+* Fixed enable preview event field value for Gradle and Standalone projects [#452](https://github.com/oracle/javavscode/pull/452)
+
+#### Other Changes
+* Updated openjdk24 URL to 24.0.2 [#442](https://github.com/oracle/javavscode/pull/442)
+
+**Full Changelog**: https://github.com/oracle/javavscode/compare/v24.1.0...v24.1.1
+
 ## Version 24.1.0
 ### What's Changed
 

vscode/CHANGELOG.md

@@ -55,6 +55,10 @@ export const jdkHomeValueHandler = (): string | null => {
         null;
 }
 
+export const projectJdkHomeValueHandler = (): string | null => {
+    return getConfigurationValue(configKeys.projectJdkHome, null);
+}
+
 export const projectSearchRootsValueHandler = (): string => {
     let projectSearchRoots: string = '';
     const isProjectFolderSearchLimited: boolean = !getConfigurationValue(configKeys.disableProjSearchLimit, false);

vscode/src/configurations/handlers.ts

@@ -14,7 +14,7 @@
   limitations under the License.
 */
 import { builtInConfigKeys, configKeys } from "../configurations/configuration"
-import { isDarkColorThemeHandler, isNetbeansVerboseEnabled, jdkHomeValueHandler, lspServerVmOptionsHandler, projectSearchRootsValueHandler, userdirHandler } from "../configurations/handlers";
+import { isDarkColorThemeHandler, isNetbeansVerboseEnabled, jdkHomeValueHandler, projectJdkHomeValueHandler, lspServerVmOptionsHandler, projectSearchRootsValueHandler, userdirHandler } from "../configurations/handlers";
 import { l10n } from "../localiser";
 import { isString } from "../utils";
 import { userDefinedLaunchOptionsType } from "./types"
@@ -25,6 +25,10 @@ export const getUserConfigLaunchOptionsDefaults = (): userDefinedLaunchOptionsTy
             value: jdkHomeValueHandler(),
             optionToPass: ['--jdkhome']
         },
+        [configKeys.projectJdkHome]: {
+            value: projectJdkHomeValueHandler(),
+            optionToPass: '-J-Dnetbeans.lsp.java.platform.override='
+        }, 
         [configKeys.userdir]: {
             value: userdirHandler(),
             optionToPass: ['--userdir']