Reflecting review feedback.

apache · Nov 29, 2023 · 5f0f098 · 5f0f098
1 parent 2fd9342
commit 5f0f098
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/api/SourceLauncher.java b/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/api/SourceLauncher.java
@@ -85,16 +85,16 @@ public static String joinCommandLines(Iterable<? extends String> inputLines) {
                             if (testVersion.startsWith("1.")) {
                                 testVersion = testVersion.substring(2);
                             }
-                            String existingVersion = joinedOptions.get("--source");
+                            String existingVersion = joinedOptions.get(SOURCE);
                             if (existingVersion != null) {
                                 if (existingVersion.startsWith("1.")) {
                                     existingVersion = existingVersion.substring(2);
                                 }
                                 if (new SpecificationVersion(testVersion).compareTo(new SpecificationVersion(existingVersion)) > 0) {
-                                    joinedOptions.put("--source", version);
+                                    joinedOptions.put(SOURCE, version);
                                 }
                             } else {
-                                joinedOptions.put("--source", version);
+                                joinedOptions.put(SOURCE, version);
                             }
                             i++;
                         }

diff --git a/...her/src/org/netbeans/modules/java/file/launcher/queries/LauncherSourceLevelQueryImpl.java b/...her/src/org/netbeans/modules/java/file/launcher/queries/LauncherSourceLevelQueryImpl.java
@@ -19,6 +19,7 @@
 package org.netbeans.modules.java.file.launcher.queries;
 
 import java.util.List;
+import java.util.Objects;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import org.netbeans.api.java.platform.JavaPlatformManager;
@@ -72,11 +73,19 @@ private void updateDelegate() {
                 }
             }
 
+            boolean modified;
+
             synchronized (this) {
-                this.sourceLevel = sourceLevel;
+                modified = !Objects.equals(this.sourceLevel, sourceLevel);
+
+                if (modified) {
+                    this.sourceLevel = sourceLevel;
+                }
             }
 
-            cs.fireChange();
+            if (modified) {
+                cs.fireChange();
+            }
         }
 
         @Override

diff --git a/...launcher/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProvider.java b/...launcher/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProvider.java
@@ -115,7 +115,7 @@ private ClassPath getSourcePath(FileObject file) {
                             }
                         }
 
-                        return root2SourceCP.computeIfAbsent(root, r -> { //XXX: weak....
+                        return root2SourceCP.computeIfAbsent(root, r -> {
                             ClassPath srcCP = ClassPathSupport.createClassPath(r);
                             GlobalPathRegistry.getDefault().register(ClassPath.SOURCE, new ClassPath[] {srcCP});
                             return srcCP;
@@ -145,7 +145,7 @@ private ClassPath getSourcePath(FileObject file) {
 
     private synchronized FileObject getSourceRootImpl(FileObject file) {
         for (FileObject root : root2SourceCP.keySet()) {
-            if (FileUtil.isParentOf(root, file) || root.equals(file)) {
+            if (root.equals(file) || FileUtil.isParentOf(root, file)) {
                 return root;
             }
         }
@@ -186,10 +186,12 @@ private ClassPath getBootPath(FileObject file) {
     );
 
     private static final Set<JavaTokenId> STOP_TOKENS = EnumSet.of(
+        JavaTokenId.IMPORT,
         JavaTokenId.PUBLIC,
         JavaTokenId.PROTECTED,
         JavaTokenId.PRIVATE,
-        JavaTokenId.CLASS
+        JavaTokenId.CLASS,
+        JavaTokenId.LBRACE
     );
 
     static String findPackage(String fileContext) {

diff --git a/...va.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceServiceImpl.java b/...va.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceServiceImpl.java
@@ -1298,7 +1298,7 @@ public void didChangeConfiguration(DidChangeConfigurationParams params) {
             }
         });
         String fullAltConfigPrefix = client.getNbCodeCapabilities().getAltConfigurationPrefix();
-        String altConfigPrefix = fullConfigPrefix.substring(0, fullAltConfigPrefix.length() - 1);
+        String altConfigPrefix = fullAltConfigPrefix.substring(0, fullAltConfigPrefix.length() - 1);
         boolean modified = false;
         String newVMOptions = "";
         JsonObject javaPlus = ((JsonObject) params.getSettings()).getAsJsonObject(altConfigPrefix);

diff --git a/java/java.lsp.server/vscode/src/nbcode.ts b/java/java.lsp.server/vscode/src/nbcode.ts
@@ -75,8 +75,8 @@ export function launch(
     }
     ideArgs.push(...extraArgs);
 
-    if (extraArgs && extraArgs.find(s => s.includes("--list"))) {
-        ideArgs.push(...['-J-Xdebug', '-J-Dnetbeans.logger.console=true', '-J-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000']);
+    if (env['netbeans_debug'] && extraArgs && extraArgs.find(s => s.includes("--list"))) {
+        ideArgs.push(...['-J-Dnetbeans.logger.console=true', '-J-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000']);
     }
 
     console.log(`Launching NBLS with arguments: ` + ideArgs);