Fix variable highlighting in arrow function apache#4209

- apache#4209
- Fix the scope for the variable in the arrow function
- Add unit tests

php/php.editor/src/org/netbeans/modules/php/editor/model/impl/ModelVisitor.java

@@ -862,9 +862,11 @@ private void prepareArrowFunctionVariable(Scope scope, Variable node) {
                 && ((FunctionScope)inScope).isAnonymous()) {
             FunctionScope functionScope = (FunctionScope) inScope;
             Collection<? extends VariableName> declaredVariables = functionScope.getDeclaredVariables();
+            List<? extends String> parameterNames = functionScope.getParameterNames();
             for (VariableName declaredVariable : declaredVariables) {
                 if (declaredVariable.getName().equals(CodeUtils.extractVariableName(node))) {
-                    if (isLexicalVariable(node)) {
+                    if (isLexicalVariable(node)
+                            || (functionScope instanceof ArrowFunctionScope) && !parameterNames.contains(declaredVariable.getName())) { // GH-4209
                         occurencesBuilder.prepare(node, inScope.getInScope());
                     } else {
                         occurencesBuilder.prepare(node, inScope);

php/php.editor/test/unit/data/testfiles/gotodeclaration/testArrowFunctions/testArrowFunctions.php

@@ -72,6 +72,11 @@ function (): ArrowFunctions {
     return fn($x) => $x + $y;
 };
 
+// GH-4209
+$gh4209a = 0;
+$gh4209b = fn() => $gh4209a > 0 ? $gh4209a + 1 : 2;
+$gh4209b = fn($gh4209c) => $gh4209a > 0 ? $gh4209a + 1 : $gh4209c + 2;
+
 function test(callable $f) {
     return fn(...$args) => !$f(...$args);
 }

php/php.editor/test/unit/data/testfiles/markoccurences/testArrowFunctions/testArrowFunctions.php

@@ -72,6 +72,11 @@ function (): ArrowFunctions {
     return fn($x) => $x + $y;
 };
 
+// GH-4209
+$gh4209a = 0;
+$gh4209b = fn() => $gh4209a > 0 ? $gh4209a + 1 : 2;
+$gh4209b = fn($gh4209c) => $gh4209a > 0 ? $gh4209a + 1 : $gh4209c + 2;
+
 function test(callable $f) {
     return fn(...$args) => !$f(...$args);
 }

php/php.editor/test/unit/data/testfiles/testArrowFunctions.php.testArrowFunctions_GH4209_01a.occurrences

@@ -0,0 +1,3 @@
+$|>MARK_OCCURRENCES:gh^4209a<| = 0;
+$gh4209b = fn() => $|>MARK_OCCURRENCES:gh4209a<| > 0 ? $|>MARK_OCCURRENCES:gh4209a<| + 1 : 2;
+$gh4209b = fn($gh4209c) => $|>MARK_OCCURRENCES:gh4209a<| > 0 ? $|>MARK_OCCURRENCES:gh4209a<| + 1 : $gh4209c + 2;

php/php.editor/test/unit/data/testfiles/testArrowFunctions.php.testArrowFunctions_GH4209_01b.occurrences

@@ -0,0 +1,3 @@
+$|>MARK_OCCURRENCES:gh4209a<| = 0;
+$gh4209b = fn() => $|>MARK_OCCURRENCES:gh420^9a<| > 0 ? $|>MARK_OCCURRENCES:gh4209a<| + 1 : 2;
+$gh4209b = fn($gh4209c) => $|>MARK_OCCURRENCES:gh4209a<| > 0 ? $|>MARK_OCCURRENCES:gh4209a<| + 1 : $gh4209c + 2;

php/php.editor/test/unit/data/testfiles/testArrowFunctions.php.testArrowFunctions_GH4209_01c.occurrences

@@ -0,0 +1,3 @@
+$|>MARK_OCCURRENCES:gh4209a<| = 0;
+$gh4209b = fn() => $|>MARK_OCCURRENCES:gh4209a<| > 0 ? $|>MARK_OCCURRENCES:gh^4209a<| + 1 : 2;
+$gh4209b = fn($gh4209c) => $|>MARK_OCCURRENCES:gh4209a<| > 0 ? $|>MARK_OCCURRENCES:gh4209a<| + 1 : $gh4209c + 2;

php/php.editor/test/unit/data/testfiles/testArrowFunctions.php.testArrowFunctions_GH4209_01d.occurrences

@@ -0,0 +1,3 @@
+$|>MARK_OCCURRENCES:gh4209a<| = 0;
+$gh4209b = fn() => $|>MARK_OCCURRENCES:gh4209a<| > 0 ? $|>MARK_OCCURRENCES:gh4209a<| + 1 : 2;
+$gh4209b = fn($gh4209c) => $|>MARK_OCCURRENCES:gh42^09a<| > 0 ? $|>MARK_OCCURRENCES:gh4209a<| + 1 : $gh4209c + 2;

php/php.editor/test/unit/data/testfiles/testArrowFunctions.php.testArrowFunctions_GH4209_01e.occurrences

@@ -0,0 +1,3 @@
+$|>MARK_OCCURRENCES:gh4209a<| = 0;
+$gh4209b = fn() => $|>MARK_OCCURRENCES:gh4209a<| > 0 ? $|>MARK_OCCURRENCES:gh4209a<| + 1 : 2;
+$gh4209b = fn($gh4209c) => $|>MARK_OCCURRENCES:gh4209a<| > 0 ? $|>MARK_OCCURRENCES:gh4^209a<| + 1 : $gh4209c + 2;

php/php.editor/test/unit/data/testfiles/testArrowFunctions.php.testArrowFunctions_GH4209_02a.occurrences

@@ -0,0 +1,2 @@
+$|>MARK_OCCURRENCES:gh4^209b<| = fn() => $gh4209a > 0 ? $gh4209a + 1 : 2;
+$|>MARK_OCCURRENCES:gh4209b<| = fn($gh4209c) => $gh4209a > 0 ? $gh4209a + 1 : $gh4209c + 2;

php/php.editor/test/unit/data/testfiles/testArrowFunctions.php.testArrowFunctions_GH4209_02b.occurrences

@@ -0,0 +1,2 @@
+$|>MARK_OCCURRENCES:gh4209b<| = fn() => $gh4209a > 0 ? $gh4209a + 1 : 2;
+$|>MARK_OCCURRENCES:gh42^09b<| = fn($gh4209c) => $gh4209a > 0 ? $gh4209a + 1 : $gh4209c + 2;

php/php.editor/test/unit/data/testfiles/testArrowFunctions.php.testArrowFunctions_GH4209_03a.occurrences

@@ -0,0 +1 @@
+$gh4209b = fn($|>MARK_OCCURRENCES:gh^4209c<|) => $gh4209a > 0 ? $gh4209a + 1 : $|>MARK_OCCURRENCES:gh4209c<| + 2;

php/php.editor/test/unit/data/testfiles/testArrowFunctions.php.testArrowFunctions_GH4209_03b.occurrences

@@ -0,0 +1 @@
+$gh4209b = fn($|>MARK_OCCURRENCES:gh4209c<|) => $gh4209a > 0 ? $gh4209a + 1 : $|>MARK_OCCURRENCES:gh42^09c<| + 2;

php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/GotoDeclarationPHP74Test.java

@@ -411,4 +411,28 @@ public void testArrowFunctions_21() throws Exception {
         checkDeclaration(getTestPath(), "    return fn(...$args) => !$f(...$ar^gs);", "    return fn(...$^args) => !$f(...$args);");
     }
 
+    public void testArrowFunctions_GH4209_01a() throws Exception {
+        checkDeclaration(getTestPath(), "$gh4209b = fn() => $g^h4209a > 0 ? $gh4209a + 1 : 2;", "$^gh4209a = 0;");
+    }
+
+    public void testArrowFunctions_GH4209_01b() throws Exception {
+        checkDeclaration(getTestPath(), "$gh4209b = fn() => $gh4209a > 0 ? $gh4^209a + 1 : 2;", "$^gh4209a = 0;");
+    }
+
+    public void testArrowFunctions_GH4209_01c() throws Exception {
+        checkDeclaration(getTestPath(), "$gh4209b = fn($gh4209c) => $gh420^9a > 0 ? $gh4209a + 1 : $gh4209c + 2;", "$^gh4209a = 0;");
+    }
+
+    public void testArrowFunctions_GH4209_01d() throws Exception {
+        checkDeclaration(getTestPath(), "$gh4209b = fn($gh4209c) => $gh4209a > 0 ? $gh4209^a + 1 : $gh4209c + 2;", "$^gh4209a = 0;");
+    }
+
+    public void testArrowFunctions_GH4209_02a() throws Exception {
+        checkDeclaration(getTestPath(), "$gh420^9b = fn($gh4209c) => $gh4209a > 0 ? $gh4209a + 1 : $gh4209c + 2;", "$^gh4209b = fn() => $gh4209a > 0 ? $gh4209a + 1 : 2;");
+    }
+
+    public void testArrowFunctions_GH4209_03a() throws Exception {
+        checkDeclaration(getTestPath(), "$gh4209b = fn($gh4209c) => $gh4209a > 0 ? $gh4209a + 1 : $gh^4209c + 2;", "$gh4209b = fn($^gh4209c) => $gh4209a > 0 ? $gh4209a + 1 : $gh4209c + 2;");
+    }
+
 }

php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/OccurrencesFinderImplPHP74Test.java

@@ -596,4 +596,40 @@ public void testArrowFunctions_25b() throws Exception {
         checkOccurrences(getTestPath(), "    return fn(...$args) => !$f(...$ar^gs);", true);
     }
 
+    public void testArrowFunctions_GH4209_01a() throws Exception {
+        checkOccurrences(getTestPath(), "$gh^4209a = 0;", true);
+    }
+
+    public void testArrowFunctions_GH4209_01b() throws Exception {
+        checkOccurrences(getTestPath(), "$gh4209b = fn() => $gh420^9a > 0 ? $gh4209a + 1 : 2;", true);
+    }
+
+    public void testArrowFunctions_GH4209_01c() throws Exception {
+        checkOccurrences(getTestPath(), "$gh4209b = fn() => $gh4209a > 0 ? $gh^4209a + 1 : 2;", true);
+    }
+
+    public void testArrowFunctions_GH4209_01d() throws Exception {
+        checkOccurrences(getTestPath(), "$gh4209b = fn($gh4209c) => $gh42^09a > 0 ? $gh4209a + 1 : $gh4209c + 2;", true);
+    }
+
+    public void testArrowFunctions_GH4209_01e() throws Exception {
+        checkOccurrences(getTestPath(), "$gh4209b = fn($gh4209c) => $gh4209a > 0 ? $gh4^209a + 1 : $gh4209c + 2;", true);
+    }
+
+    public void testArrowFunctions_GH4209_02a() throws Exception {
+        checkOccurrences(getTestPath(), "$gh4^209b = fn() => $gh4209a > 0 ? $gh4209a + 1 : 2;", true);
+    }
+
+    public void testArrowFunctions_GH4209_02b() throws Exception {
+        checkOccurrences(getTestPath(), "$gh42^09b = fn($gh4209c) => $gh4209a > 0 ? $gh4209a + 1 : $gh4209c + 2;", true);
+    }
+
+    public void testArrowFunctions_GH4209_03a() throws Exception {
+        checkOccurrences(getTestPath(), "$gh4209b = fn($gh^4209c) => $gh4209a > 0 ? $gh4209a + 1 : $gh4209c + 2;", true);
+    }
+
+    public void testArrowFunctions_GH4209_03b() throws Exception {
+        checkOccurrences(getTestPath(), "$gh4209b = fn($gh4209c) => $gh4209a > 0 ? $gh4209a + 1 : $gh42^09c + 2;", true);
+    }
+
 }