Add used enums into the list of used variable names

Currently, Enums aren't being added to the list of used variable names which can result in collisions when naming new variable.
openrewrite · Oct 22, 2024 · 6409220 · 6409220
1 parent 212059e
commit 6409220
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
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,15 @@ public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations
             return super.visitVariable(variable, strings);
         }
 
+        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();