Fixes #558

raamcosta · Jan 11, 2024 · b4ff210 · b4ff210
1 parent e50b934
commit b4ff210
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/...gen/src/main/java/com/ramcosta/composedestinations/codegen/validators/InitialValidator.kt b/...gen/src/main/java/com/ramcosta/composedestinations/codegen/validators/InitialValidator.kt
@@ -238,26 +238,30 @@ class InitialValidator(
 
         if (firstTypeArg is TypeArgument.Error) {
             // Since the Destination is not yet generated, we are expecting this to happen
-            Logger.instance.info("getFirstArgTypeSimpleName | line error = \"${firstTypeArg.lineStr}\"")
+            Logger.instance.info("getFirstArgTypeSimpleName | line error = \n```\n${firstTypeArg.lineStr}\n```")
             return firstTypeArg.lineStr
+                .replaceBefore(this.name, "")
+                .removePrefix(this.name).also {
+                    Logger.instance.info("getFirstArgTypeSimpleName | result of removePrefix ${this.name} = \n```\n$it\n```")
+                }
                 .replaceBefore("ResultRecipient", "")
                 .removePrefix("ResultRecipient").also {
-                    Logger.instance.info("getFirstArgTypeSimpleName | result of removePrefix ResultRecipient = \"$it\"")
+                    Logger.instance.info("getFirstArgTypeSimpleName | result of removePrefix ResultRecipient = \n```\n$it\n```")
                 }
                 .replaceBefore("<", "")
                 .removePrefix("<").also {
-                    Logger.instance.info("getFirstArgTypeSimpleName | result of removePrefix < = \"$it\"")
+                    Logger.instance.info("getFirstArgTypeSimpleName | result of removePrefix < = \n```\n$it\n```")
                 }
                 .replaceAfter(">", "")
                 .removeSuffix(">").also {
-                    Logger.instance.info("getFirstArgTypeSimpleName | result of removeSuffix > = \"$it\"")
+                    Logger.instance.info("getFirstArgTypeSimpleName | result of removeSuffix > = \n```\n$it\n```")
                 }
                 .split(",").also {
-                    Logger.instance.info("getFirstArgTypeSimpleName | result of split = \"$it\"")
+                    Logger.instance.info("getFirstArgTypeSimpleName | result of split = \n```\n$it\n```")
                 }
                 .first()
                 .trim().also {
-                    Logger.instance.info("getFirstArgTypeSimpleName | Result of trim = \"$it\"")
+                    Logger.instance.info("getFirstArgTypeSimpleName | Result of trim = \n```\n$it\n```")
                 }
         }
 

diff --git a/.../kotlin/com/ramcosta/composedestinations/ksp/processors/KspToCodeGenDestinationsMapper.kt b/.../kotlin/com/ramcosta/composedestinations/ksp/processors/KspToCodeGenDestinationsMapper.kt
@@ -520,7 +520,7 @@ class KspToCodeGenDestinationsMapper(
         val fileLocation = location as? FileLocation ?: return "NonExistentLocation"
         return File(fileLocation.filePath)
             .readLines(fileLocation.lineNumber, fileLocation.lineNumber + 10)
-            .joinToString("")
+            .joinToString("\n")
     }