Match type of unused variable name.

openrewrite · Dec 2, 2023 · 98caf69 · 98caf69
1 parent 258ef2c
commit 98caf69
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/src/main/kotlin/org/openrewrite/kotlin/KotlinTypeMapping.kt b/src/main/kotlin/org/openrewrite/kotlin/KotlinTypeMapping.kt
@@ -57,6 +57,7 @@ import org.openrewrite.java.tree.JavaType
 import org.openrewrite.java.tree.JavaType.*
 import org.openrewrite.java.tree.TypeUtils
 import org.openrewrite.kotlin.KotlinTypeSignatureBuilder.Companion.convertClassIdToFqn
+import org.openrewrite.kotlin.KotlinTypeSignatureBuilder.Companion.variableName
 import kotlin.collections.ArrayList
 
 @Suppress("DuplicatedCode")
@@ -827,7 +828,7 @@ class KotlinTypeMapping(
         val vt = Variable(
             null,
             mapToFlagsBitmap(variable.visibility, variable.modality),
-            variable.name.asString(),
+            variableName(variable.name.asString()),
             null, null, null
         )
         typeCache.put(signature, vt)
@@ -1154,7 +1155,7 @@ class KotlinTypeMapping(
         val variable = Variable(
             null,
             convertToFlagsBitMap(javaField.visibility, javaField.isStatic, javaField.isFinal, javaField.isAbstract),
-            javaField.name.asString(),
+            variableName(javaField.name.asString()),
             null, null, null
         )
         typeCache.put(signature, variable)

diff --git a/src/main/kotlin/org/openrewrite/kotlin/KotlinTypeSignatureBuilder.kt b/src/main/kotlin/org/openrewrite/kotlin/KotlinTypeSignatureBuilder.kt
@@ -523,7 +523,7 @@ class KotlinTypeSignatureBuilder(private val firSession: FirSession, private val
             else -> fileSignature(firFile)
         }
         sig.append(owner)
-        sig.append("{name=${property.name.asString()}")
+        sig.append("{name=${variableName(property.name.asString())}")
         sig.append(",type=${signature(property.returnTypeRef)}}")
         return sig.toString()
     }
@@ -661,7 +661,7 @@ class KotlinTypeSignatureBuilder(private val firSession: FirSession, private val
             owner = owner.substring(0, owner.indexOf('<'))
         }
         sig.append(owner)
-        sig.append("{name=${javaField.name.asString()}")
+        sig.append("{name=${variableName(javaField.name.asString())}")
         sig.append(",type=${signature(javaField.type)}}")
         return sig.toString()
     }
@@ -687,5 +687,12 @@ class KotlinTypeSignatureBuilder(private val firSession: FirSession, private val
                 .replace("?", "")
             return if (cleanedFqn.startsWith(".")) cleanedFqn.substring(1) else cleanedFqn
         }
+
+        fun variableName(name: String): String {
+            return when (name) {
+                "<unused var>" -> "_"
+                else -> name
+            }
+        }
     }
 }
diff --git a/src/test/java/org/openrewrite/kotlin/KotlinTypeMappingTest.java b/src/test/java/org/openrewrite/kotlin/KotlinTypeMappingTest.java
@@ -1016,5 +1016,30 @@ public J.Identifier visitIdentifier(J.Identifier identifier, Integer integer) {
               )
             );
         }
+
+        @Issue("https://github.com/openrewrite/rewrite-kotlin/issues/483")
+        @Test
+        void unusedVar() {
+            //noinspection RemoveRedundantBackticks,RemoveRedundantQualifierName
+            rewriteRun(
+              kotlin(
+                "val unused: (Int, Int) -> Int = { _, y -> y }",
+                spec -> spec.afterRecipe(cu -> {
+                    AtomicBoolean found = new AtomicBoolean(false);
+                    new KotlinIsoVisitor<Integer>() {
+                        @Override
+                        public J.Identifier visitIdentifier(J.Identifier identifier, Integer integer) {
+                            if ("_".equals(identifier.getSimpleName())) {
+                                assertThat(identifier.getFieldType().getName()).isEqualTo("_");
+                                found.set(true);
+                            }
+                            return super.visitIdentifier(identifier, integer);
+                        }
+                    }.visit(cu, 0);
+                    assertThat(found.get()).isTrue();
+                })
+              )
+            );
+        }
     }
 }