Merge pull request #8443 from apache/delivery

ebarboni · web-flow · commit 473241e74600 · 2025-04-25T13:48:40.000+02:00
Sync delivery to release260 for 26-rc2
diff --git a/ide/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/impl/SecureURLResourceRetrieverTest.java b/ide/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/impl/SecureURLResourceRetrieverTest.java
@@ -79,6 +79,7 @@ public void shouldAskForSelfSignedCertificate() throws Exception {
     @Test
     public void shouldUseKeyStoreFromSystemProperties() throws Exception {
         System.setProperty("javax.net.debug", "ssl,keystore");
+        // get from https://badssl.com/download/ (expires 04.2027)
         System.setProperty("javax.net.ssl.keyStore", SecureURLResourceRetrieverTest.class.getResource("badssl.com-client.p12").getPath());
         System.setProperty("javax.net.ssl.keyStorePassword", "badssl.com");
         System.setProperty("javax.net.ssl.keyStoreType", "pkcs12");
diff --git a/ide/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/impl/badssl.com-client.p12 b/ide/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/impl/badssl.com-client.p12
diff --git a/java/maven.junit/src/org/netbeans/modules/maven/junit/JUnitOutputListenerProvider.java b/java/maven.junit/src/org/netbeans/modules/maven/junit/JUnitOutputListenerProvider.java
@@ -316,7 +316,13 @@ static boolean isFullJavaId(String possibleNewRunningTestClass) {
             }
             if (null != outputDir) {
                 createSession(outputDir);
-                project2outputDirs.put(visitor.getContext().getCurrentProject(), outputDir);
+                OutputVisitor.Context context = visitor.getContext();
+                if (context != null) {
+                    Project currentProject = context.getCurrentProject();
+                    if (currentProject != null) {
+                        project2outputDirs.put(currentProject, outputDir);
+                    }
+                }
             }
         }
     }
@@ -325,10 +331,13 @@ private String getReportsDirectory(String groupId, String artifactId, String goa
         MavenProject currentProject = null;
         // get maven module from context if available
         OutputVisitor.Context context = visitor.getContext();
-        if (context != null && context.getCurrentProject() != null) {
-            NbMavenProject subProject = context.getCurrentProject().getLookup().lookup(NbMavenProject.class);
-            if (subProject != null) {
-                currentProject = subProject.getMavenProject();
+        if (context != null) {
+            Project cp = context.getCurrentProject();
+            if (cp != null) {
+                NbMavenProject subProject = cp.getLookup().lookup(NbMavenProject.class);
+                if (subProject != null) {
+                    currentProject = subProject.getMavenProject();
+                }
             }
         }
         if (currentProject == null) {
@@ -590,12 +599,20 @@ private boolean usingJUnit4(MavenProject prj) { // SUREFIRE-724
         if (runningTestClass != null) {
             generateTest();
         }
-        File outputDir = project2outputDirs.remove(visitor.getContext().getCurrentProject());
-        TestSession session = outputDir != null ? outputDir2sessions.remove(outputDir) : null;
-        if (session != null) {
-            CoreManager junitManager = getManagerProvider();
-            if (junitManager != null) {
-                junitManager.sessionFinished(session);
+        OutputVisitor.Context context = visitor.getContext();
+        if (context != null) {
+            Project currentProject = context.getCurrentProject();
+            if (currentProject != null) {
+                File outputDir = project2outputDirs.remove(currentProject);
+                if (outputDir != null) {
+                    TestSession session = outputDir2sessions.remove(outputDir);
+                    if (session != null) {
+                        CoreManager junitManager = getManagerProvider();
+                        if (junitManager != null) {
+                            junitManager.sessionFinished(session);
+                        }
+                    }
+                }
             }
         }
         runningTestClass = null;
@@ -633,28 +650,31 @@ static Trouble constructTrouble(@NonNull String type, @NullAllowed String messag
     }
 
     public @Override void sequenceFail(String sequenceId, OutputVisitor visitor) {
-        LOG.log(Level.FINE, "Got sequenceFail: {0}, line {1}", new Object[] { visitor.getContext().getCurrentProject(), visitor.getLine() });
-        // try to get the failed test class. How can this be solved if it is not the first one in the list?
-        if(surefireRunningInParallel) {
-            String saveRunningTestClass = runningTestClass;
-            
-            Project currentProject = visitor.getContext().getCurrentProject();
-            for (String s : runningTestClassesInParallel) {
-                File outputDir = locateOutputDirAndWait(s, false);
-                // match the output dir to the project
-                if (outputDir != null) {
-                    Project outputOwner = FileOwnerQuery.getOwner(FileUtil.toFileObject(outputDir));
-                    if (outputOwner == currentProject) {
-                        LOG.log(Level.FINE, "Found unfinished test {0} in {1}, trying to finish", new Object[] { s, currentProject });
-                        runningTestClass  = s;
-                        if (Objects.equals(saveRunningTestClass, s)) {
-                            saveRunningTestClass = null;
+        OutputVisitor.Context context = visitor.getContext();
+        if (context != null) {
+            Project currentProject = context.getCurrentProject();
+            LOG.log(Level.FINE, "Got sequenceFail: {0}, line {1}", new Object[] {currentProject, visitor.getLine()});
+            // try to get the failed test class. How can this be solved if it is not the first one in the list?
+            if (currentProject != null && surefireRunningInParallel) {
+                String saveRunningTestClass = runningTestClass;
+
+                for (String s : runningTestClassesInParallel) {
+                    File outputDir = locateOutputDirAndWait(s, false);
+                    // match the output dir to the project
+                    if (outputDir != null) {
+                        Project outputOwner = FileOwnerQuery.getOwner(FileUtil.toFileObject(outputDir));
+                        if (outputOwner == currentProject) {
+                            LOG.log(Level.FINE, "Found unfinished test {0} in {1}, trying to finish", new Object[] {s, currentProject});
+                            runningTestClass = s;
+                            if (Objects.equals(saveRunningTestClass, s)) {
+                                saveRunningTestClass = null;
+                            }
+                            generateTest();
                         }
-                        generateTest();
                     }
                 }
+                runningTestClass = saveRunningTestClass;
             }
-            runningTestClass = saveRunningTestClass;
         }
         sequenceEnd(sequenceId, visitor);
     }
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsSemanticAnalyzer.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsSemanticAnalyzer.java
@@ -402,11 +402,11 @@ public boolean enterObjectNode(ObjectNode objectNode) {
 
             @Override
             public boolean enterVarNode(VarNode varNode) {
-                if (varNode.isLet()) {
+                if (varNode.isLet() || varNode.isConst()) {
                     TokenSequence<? extends JsTokenId> ts = LexUtilities.getJsPositionedSequence(result.getSnapshot(), varNode.getStart() - 1);
                     if (ts != null) {
                         Token<? extends JsTokenId> token = LexUtilities.findPreviousNonWsNonComment(ts);
-                        if (token != null && token.id() == JsTokenId.RESERVED_LET) {
+                        if (token != null && (token.id() == JsTokenId.RESERVED_LET || token.id() == JsTokenId.KEYWORD_CONST)) {
                             highlights.put(LexUtilities.getLexerOffsets(result,
                                     new OffsetRange(ts.offset(), ts.offset() + token.length())), SEMANTIC_KEYWORD);
                         }
diff --git a/webcommon/javascript2.editor/test/unit/data/testfiles/coloring/await.js.semantic b/webcommon/javascript2.editor/test/unit/data/testfiles/coloring/await.js.semantic
@@ -1 +1 @@
-for |>CUSTOM2:await<| (const i of num()) {}
+for |>CUSTOM2:await<| (|>CUSTOM2:const<| i of num()) {}
diff --git a/webcommon/javascript2.editor/test/unit/data/testfiles/coloring/semanticalKeywords.js b/webcommon/javascript2.editor/test/unit/data/testfiles/coloring/semanticalKeywords.js
@@ -47,3 +47,4 @@ class Test {
     }
 }
 
+const test2 = 7;
diff --git a/webcommon/javascript2.editor/test/unit/data/testfiles/coloring/semanticalKeywords.js.semantic b/webcommon/javascript2.editor/test/unit/data/testfiles/coloring/semanticalKeywords.js.semantic
@@ -47,3 +47,4 @@ class |>CLASS,GLOBAL:Test<| {
     }
 }
 
+|>CUSTOM2:const<| test2 = 7;
diff --git a/webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/blockscope/arrayLiteral01.js.semantic b/webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/blockscope/arrayLiteral01.js.semantic
@@ -2,13 +2,13 @@
 
 function |>METHOD:_getFileList<|(buildType, fileList, theme) {
   |>CUSTOM2:let<| |>LOCAL_VARIABLE_DECLARATION:result<| = [];
-  for (const file of fileList) {
+  for (|>CUSTOM2:const<| file of fileList) {
     if (file.buildType === buildType || !file.buildType) {
       |>CUSTOM2:let<| |>LOCAL_VARIABLE_DECLARATION:matches<| = [];
       |>CUSTOM2:let<| |>LOCAL_VARIABLE_DECLARATION:dest<|;
       |>CUSTOM2:let<| |>LOCAL_VARIABLE_DECLARATION:cwd<|;
       for (|>CUSTOM2:let<| |>CLASS:src<| of file.src) {
-        const exclusion = src.indexOf('!') === 0;
+        |>CUSTOM2:const<| exclusion = src.indexOf('!') === 0;
         |>LOCAL_VARIABLE:cwd<| = file.cwd;
         |>LOCAL_VARIABLE:dest<| = file.dest;
         |>LOCAL_VARIABLE:cwd<| = (_isFunction(file.cwd) ? |>LOCAL_VARIABLE:cwd<|(theme) : |>LOCAL_VARIABLE:cwd<|) || '';
@@ -23,7 +23,7 @@ function |>METHOD:_getFileList<|(buildType, fileList, theme) {
           |>LOCAL_VARIABLE:matches<| = _union(|>LOCAL_VARIABLE:matches<|, |>LOCAL_VARIABLE:match<|);
         }
       }
-      const prefixedPaths = _addFileListPathPrefix(|>LOCAL_VARIABLE:matches<|, |>LOCAL_VARIABLE:dest<|, |>GLOBAL:util<|.destPath(|>LOCAL_VARIABLE:cwd<|));
+      |>CUSTOM2:const<| prefixedPaths = _addFileListPathPrefix(|>LOCAL_VARIABLE:matches<|, |>LOCAL_VARIABLE:dest<|, |>GLOBAL:util<|.destPath(|>LOCAL_VARIABLE:cwd<|));
       |>LOCAL_VARIABLE:result<| = |>LOCAL_VARIABLE:result<|.concat(prefixedPaths);
     }
   }
diff --git a/webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/classes/class04.js.semantic b/webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/classes/class04.js.semantic
@@ -12,14 +12,14 @@ class |>CLASS,GLOBAL:Point<| {
      * @param {Point} b 
      */
     |>CUSTOM2:static<| |>METHOD:distance<|(a, b) {
-        const dx = a.|>FIELD:x<| - b.|>FIELD:x<|;
-        const dy = a.|>FIELD:y<| - b.|>FIELD:y<|;
+        |>CUSTOM2:const<| dx = a.|>FIELD:x<| - b.|>FIELD:x<|;
+        |>CUSTOM2:const<| dy = a.|>FIELD:y<| - b.|>FIELD:y<|;
 
         return |>GLOBAL:Math<|.sqrt(dx*dx + dy*dy);
     }
 }
   
-const p1 = new |>GLOBAL:Point<|(5, 5);
-const p2 = new |>GLOBAL:Point<|(10, 10);
+|>CUSTOM2:const<| p1 = new |>GLOBAL:Point<|(5, 5);
+|>CUSTOM2:const<| p2 = new |>GLOBAL:Point<|(10, 10);
 
 |>GLOBAL:console<|.log(|>GLOBAL:Point<|.distance(p1, p2)); 
diff --git a/webcommon/javascript2.editor/test/unit/data/testfiles/parser/asyncFunctions/asyncFunctions1.js.semantic b/webcommon/javascript2.editor/test/unit/data/testfiles/parser/asyncFunctions/asyncFunctions1.js.semantic
@@ -3,7 +3,7 @@ export default {
   |>FIELD:path<|: '/',
 
   |>CUSTOM2:async<| |>METHOD:action<|() {
-    const component = |>CUSTOM2:await<| next();
+    |>CUSTOM2:const<| component = |>CUSTOM2:await<| next();
 
   },
 
diff --git a/webcommon/javascript2.editor/test/unit/data/testfiles/parser/asyncFunctions/asyncFunctions2.js.semantic b/webcommon/javascript2.editor/test/unit/data/testfiles/parser/asyncFunctions/asyncFunctions2.js.semantic
@@ -1,5 +1,5 @@
-const |>METHOD:fooBar<| = |>CUSTOM2:async<| () => {
+|>CUSTOM2:const<| |>METHOD:fooBar<| = |>CUSTOM2:async<| () => {
     if (|>GLOBAL:user<|) {
-      const userLogin = |>CUSTOM2:await<| test();
+      |>CUSTOM2:const<| userLogin = |>CUSTOM2:await<| test();
     }
 }
diff --git a/webcommon/javascript2.editor/test/unit/data/testfiles/parser/topLevelAwait.js.semantic b/webcommon/javascript2.editor/test/unit/data/testfiles/parser/topLevelAwait.js.semantic
@@ -19,4 +19,4 @@
 
 import |>GLOBAL:dummy<| |>CUSTOM2:from<| './dummy.mjs';
 
-const demo = |>CUSTOM2:await<| |>GLOBAL:dummy<|();
+|>CUSTOM2:const<| demo = |>CUSTOM2:await<| |>GLOBAL:dummy<|();
diff --git a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java
@@ -1512,7 +1512,7 @@ private void handleDeclarations() {
                         handleDeclaredFunction(currentBlockScope, parentFn, fnNode);
                     }
                     for (VarNode varNode : declaredVars) {
-                        if (varNode.isLet()) {
+                        if (varNode.isBlockScoped()) {
                             // block scope variable
                             handleDeclaredVariable(currentBlockScope, parentFn, varNode, docHolder);
                         } else {
@@ -1779,10 +1779,15 @@ public boolean enterLiteralNode(LiteralNode lNode) {
                 pathIndex++;
                 lastVisited = getPath().get(pathSize - pathIndex);
             }
-            if ( lastVisited instanceof VarNode) {
+            if (lastVisited instanceof VarNode) {
                 fqName = getName((VarNode)lastVisited);
                 isDeclaredInParent = true;
-                JsObject declarationScope = ((VarNode)lastVisited).isLet() ? modelBuilder.getCurrentDeclarationScope() : modelBuilder.getCurrentDeclarationFunction();
+                JsObject declarationScope;
+                if (((VarNode) lastVisited).isBlockScoped()) {
+                    declarationScope = modelBuilder.getCurrentDeclarationScope();
+                } else {
+                    declarationScope = modelBuilder.getCurrentDeclarationFunction();
+                }
                 parent = declarationScope;
                 if (fqName.size() == 1 && !ModelUtils.isGlobal(declarationScope)) {
                     isPrivate = true;
diff --git a/webcommon/javascript2.model/test/unit/data/testfiles/markoccurences/issueGH8299.js b/webcommon/javascript2.model/test/unit/data/testfiles/markoccurences/issueGH8299.js
@@ -0,0 +1,8 @@
+'use strict';
+
+function testX(a = true) {
+    const x = 1; // caret on x here does not highlight usage of x in next line
+    x; // caret on x here highlights both x
+    function () {
+    }
+}
diff --git a/webcommon/javascript2.model/test/unit/data/testfiles/markoccurences/issueGH8299.js.model b/webcommon/javascript2.model/test/unit/data/testfiles/markoccurences/issueGH8299.js.model
@@ -0,0 +1,19 @@
+FUNCTION issueGH8299 [ANONYMOUS: false, DECLARED: true - issueGH8299, MODIFIERS: PUBLIC, FILE]
+# RETURN TYPES
+undefined, RESOLVED: true
+# PROPERTIES
+testX : FUNCTION testX [ANONYMOUS: false, DECLARED: true - testX, MODIFIERS: PUBLIC, FUNCTION]
+      # RETURN TYPES
+      undefined, RESOLVED: true
+      # PARAMETERS
+      OBJECT a [ANONYMOUS: false, DECLARED: true - a, MODIFIERS: PUBLIC, PARAMETER]
+      # PROPERTIES
+      arguments : OBJECT arguments [ANONYMOUS: false, DECLARED: false - arguments, MODIFIERS: PRIVATE, VARIABLE]
+      block-40  : OBJECT block-40 [ANONYMOUS: false, DECLARED: false - block-40, MODIFIERS: PUBLIC, BLOCK]
+                # PROPERTIES
+                issueGH8299testX#L#6 : FUNCTION issueGH8299testX#L#6 [ANONYMOUS: true, DECLARED: true - issueGH8299testX#L#6, MODIFIERS: PRIVATE, METHOD]
+                                     # RETURN TYPES
+                                     undefined, RESOLVED: true
+                                     # PROPERTIES
+                                     arguments : OBJECT arguments [ANONYMOUS: false, DECLARED: false - arguments, MODIFIERS: PRIVATE, VARIABLE]
+                x                    : OBJECT x [ANONYMOUS: false, DECLARED: true - x, MODIFIERS: PRIVATE, CONSTANT]
diff --git a/webcommon/javascript2.model/test/unit/src/org/netbeans/modules/javascript2/model/ModelTest.java b/webcommon/javascript2.model/test/unit/src/org/netbeans/modules/javascript2/model/ModelTest.java
@@ -278,6 +278,10 @@ public void testIssue252135() throws Exception {
         checkModel("testfiles/markoccurences/issue252135.js");
     }
 
+    public void testGH8299() throws Exception {
+        checkModel("testfiles/markoccurences/issueGH8299.js");
+    }
+
     public void testIssue231530() throws Exception {
         checkModel("testfiles/model/issue231530.js");
     }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-for \|>CUSTOM2:await<\| (const i of num()) {}`
	`1`	`+for \|>CUSTOM2:await<\| (\|>CUSTOM2:const<\| i of num()) {}`
Original file line number	Diff line number	Diff line change
`@@ -47,3 +47,4 @@ class Test {`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
	`50`	`+const test2 = 7;`
Original file line number	Diff line number	Diff line change
`@@ -47,3 +47,4 @@ class \|>CLASS,GLOBAL:Test<\| {`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
	`50`	`+\|>CUSTOM2:const<\| test2 = 7;`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,13 @@`
`2`	`2`
`3`	`3`	`function \|>METHOD:_getFileList<\|(buildType, fileList, theme) {`
`4`	`4`	`\|>CUSTOM2:let<\| \|>LOCAL_VARIABLE_DECLARATION:result<\| = [];`
`5`		`- for (const file of fileList) {`
	`5`	`+ for (\|>CUSTOM2:const<\| file of fileList) {`
`6`	`6`	`if (file.buildType === buildType \|\| !file.buildType) {`
`7`	`7`	`\|>CUSTOM2:let<\| \|>LOCAL_VARIABLE_DECLARATION:matches<\| = [];`
`8`	`8`	`\|>CUSTOM2:let<\| \|>LOCAL_VARIABLE_DECLARATION:dest<\|;`
`9`	`9`	`\|>CUSTOM2:let<\| \|>LOCAL_VARIABLE_DECLARATION:cwd<\|;`
`10`	`10`	`for (\|>CUSTOM2:let<\| \|>CLASS:src<\| of file.src) {`
`11`		`- const exclusion = src.indexOf('!') === 0;`
	`11`	`+ \|>CUSTOM2:const<\| exclusion = src.indexOf('!') === 0;`
`12`	`12`	`\|>LOCAL_VARIABLE:cwd<\| = file.cwd;`
`13`	`13`	`\|>LOCAL_VARIABLE:dest<\| = file.dest;`
`14`	`14`	`\|>LOCAL_VARIABLE:cwd<\| = (_isFunction(file.cwd) ? \|>LOCAL_VARIABLE:cwd<\|(theme) : \|>LOCAL_VARIABLE:cwd<\|) \|\| '';`
`@@ -23,7 +23,7 @@ function \|>METHOD:_getFileList<\|(buildType, fileList, theme) {`
`23`	`23`	`\|>LOCAL_VARIABLE:matches<\| = _union(\|>LOCAL_VARIABLE:matches<\|, \|>LOCAL_VARIABLE:match<\|);`
`24`	`24`	`}`
`25`	`25`	`}`
`26`		`- const prefixedPaths = _addFileListPathPrefix(\|>LOCAL_VARIABLE:matches<\|, \|>LOCAL_VARIABLE:dest<\|, \|>GLOBAL:util<\|.destPath(\|>LOCAL_VARIABLE:cwd<\|));`
	`26`	`+ \|>CUSTOM2:const<\| prefixedPaths = _addFileListPathPrefix(\|>LOCAL_VARIABLE:matches<\|, \|>LOCAL_VARIABLE:dest<\|, \|>GLOBAL:util<\|.destPath(\|>LOCAL_VARIABLE:cwd<\|));`
`27`	`27`	`\|>LOCAL_VARIABLE:result<\| = \|>LOCAL_VARIABLE:result<\|.concat(prefixedPaths);`
`28`	`28`	`}`
`29`	`29`	`}`