Polish

Author: jevanlingen

rewrite-kotlin/src/main/kotlin/org/openrewrite/kotlin/KotlinTypeMapping.kt

@@ -779,7 +779,7 @@ class KotlinTypeMapping(
                 }
             } else if (resolvedSymbol.callableId.classId == null) {
                 methodDeclarationType(resolvedSymbol.fir, null)
-                declaringType = ShallowClass.build(resolvedSymbol.callableId.packageName.toString() + "." + firFile.name)
+                declaringType = ShallowClass.build(resolvedSymbol.callableId.packageName.toString() + "." + firFile.name.replaceFirst(".kts", "Kt").replaceFirst(".kt", "Kt"))
                     //.withMethods(mutableListOf(methodDeclarationType(resolvedSymbol.fir, null)))
                 //TODO: <need to add methods information here too
             }

rewrite-kotlin/src/main/kotlin/org/openrewrite/kotlin/KotlinTypeSignatureBuilder.kt

@@ -382,7 +382,7 @@ class KotlinTypeSignatureBuilder(private val firSession: FirSession, private val
                     declaringSig = "kotlin.Library"
                 }
             } else if (resolvedSymbol.callableId.classId == null) {
-                declaringSig = resolvedSymbol.callableId.packageName.toString() + "." + firFile.name
+                declaringSig = resolvedSymbol.callableId.packageName.toString() + "." + firFile.name.replaceFirst(".kts", "Kt").replaceFirst(".kt", "Kt")
             }
         } else if (sym is FirFunctionSymbol<*>) {
             declaringSig = signature(function.typeRef)

rewrite-kotlin/src/test/java/org/openrewrite/kotlin/tree/KTSTest.java

@@ -62,7 +62,7 @@ fun two() = "two"
                     .satisfies(m -> {
                        assertThat(m.getDeclaringType())
                          .satisfies(it -> {
-                             assertThat(it.getFullyQualifiedName()).isEqualTo("org.example.openRewriteFile1.kts");
+                             assertThat(it.getFullyQualifiedName()).isEqualTo("org.example.openRewriteFile1Kt");
                              assertThat(it.getMethods()).hasSize(2);
                          });
                     });