Merge branch 'main' into add-dependency-to-parent-pom

openrewrite · Oct 22, 2024 · 08ded76 · 08ded76
2 parents 14a7f0b + 49524a7
commit 08ded76
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/rewrite-core/src/test/java/org/openrewrite/RecipeLifecycleTest.java b/rewrite-core/src/test/java/org/openrewrite/RecipeLifecycleTest.java
@@ -139,7 +139,7 @@ public TreeVisitor<?, ExecutionContext> getScanner(Integer acc) {
             //noinspection NullableProblems
             return new TreeVisitor<>() {
                 @Override
-                public Tree visit(Tree tree, ExecutionContext executionContext) {
+                public Tree visit(Tree tree, ExecutionContext ctx) {
                     if (tree.getMarkers().findFirst(RecipesThatMadeChanges.class).isPresent()) {
                         return tree;
                     }

diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/VariableNameUtilsTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/VariableNameUtilsTest.java
@@ -106,6 +106,23 @@ class Test {
         );
     }
 
+    @Test
+    void enumFieldNames() {
+        rewriteRun(
+          baseTest("myType", "myType,TYPES"),
+          java(
+            """
+              class Test {
+                  TYPES myType;
+              }
+              enum TYPES {
+               VALUE, NUMBER, TEXT
+              }
+              """
+          )
+        );
+    }
+
     @Test
     void allClassFieldsAreFound() {
         rewriteRun(

diff --git a/rewrite-java/src/main/java/org/openrewrite/java/VariableNameUtils.java b/rewrite-java/src/main/java/org/openrewrite/java/VariableNameUtils.java
@@ -263,6 +263,16 @@ public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations
             return super.visitVariable(variable, strings);
         }
 
+        @Override
+        public J.Identifier visitIdentifier(J.Identifier identifier, Set<String> namesInScope) {
+            J.Identifier v = super.visitIdentifier(identifier, namesInScope);
+            if (v.getType() instanceof JavaType.Class &&
+                    ((JavaType.Class) v.getType()).getKind() == JavaType.FullyQualified.Kind.Enum) {
+                namesInScope.add(v.getSimpleName());
+            }
+            return v;
+        }
+
         private void addImportedStaticFieldNames(@Nullable JavaSourceFile cu, Cursor classCursor) {
             if (cu != null) {
                 List<J.Import> imports = cu.getImports();