Improved error message

Mr-Mappie · Jun 26, 2024 · c3eb04a · c3eb04a
1 parent d42edab
commit c3eb04a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/compiler-plugin/src/main/kotlin/tech/mappie/resolving/classes/ObjectMappingBodyCollector.kt b/compiler-plugin/src/main/kotlin/tech/mappie/resolving/classes/ObjectMappingBodyCollector.kt
@@ -80,7 +80,8 @@ private class ObjectBodyStatementCollector(
                 target to ExpressionSource(
                     dispatchReceiverSymbol,
                     source,
-                    (source.type as IrSimpleType).arguments[1].typeOrFail
+                    (source.type as IrSimpleType).arguments[1].typeOrFail,
+                    expression,
                 )
             }
             IDENTIFIER_TRANFORM -> {

diff --git a/compiler-plugin/src/main/kotlin/tech/mappie/resolving/classes/ObjectMappingSource.kt b/compiler-plugin/src/main/kotlin/tech/mappie/resolving/classes/ObjectMappingSource.kt
@@ -36,6 +36,7 @@ data class ExpressionSource(
     val extensionReceiverSymbol: IrValueSymbol,
     val expression: IrFunctionExpression,
     val type: IrType,
+    val origin: IrExpression?,
 ) : ObjectMappingSource {
     override fun resolveType() = type
 }

diff --git a/compiler-plugin/src/main/kotlin/tech/mappie/validation/MappingValidation.kt b/compiler-plugin/src/main/kotlin/tech/mappie/validation/MappingValidation.kt
@@ -11,6 +11,7 @@ import tech.mappie.util.location
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
 import org.jetbrains.kotlin.ir.IrFileEntry
 import org.jetbrains.kotlin.ir.types.getClass
+import tech.mappie.resolving.classes.ExpressionSource
 
 data class Problem(
     val description: String,
@@ -56,7 +57,11 @@ interface MappingValidation {
                         .filter { (target, sources) -> !target.type.isAssignableFrom(sources.single().resolveType()) }
                         .map { (target, sources) -> Problem.error(
                             "Target ${mapping.targetType.getClass()!!.name.asString()}.${target.name.asString()} has type ${target.type.pretty()} which cannot be assigned from type ${sources.single().resolveType().pretty()}",
-                            (sources.single() as? PropertySource)?.origin?.let { location(file, it) }
+                            when (val source = sources.single()) {
+                                is PropertySource -> source.origin?.let { location(file, it) }
+                                is ExpressionSource -> source.origin?.let { location(file, it) }
+                                else -> null
+                            }
                         ) }
                 )