From 24446fc4f4914bfcbc0269ba59ef9e17c1d2cbb7 Mon Sep 17 00:00:00 2001 From: 0xera <56160164+0xera@users.noreply.github.com> Date: Sat, 8 Jun 2024 18:02:22 +0300 Subject: [PATCH] fix test tag applying - cant find modifier object --- .../compose/test/tag/applier/TestTagApplier.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/compiler-plugin/compose-test-tag/applier/plugin/src/main/kotlin/com/vk/compiler/plugin/compose/test/tag/applier/TestTagApplier.kt b/compiler-plugin/compose-test-tag/applier/plugin/src/main/kotlin/com/vk/compiler/plugin/compose/test/tag/applier/TestTagApplier.kt index 3655880..4a20ddc 100644 --- a/compiler-plugin/compose-test-tag/applier/plugin/src/main/kotlin/com/vk/compiler/plugin/compose/test/tag/applier/TestTagApplier.kt +++ b/compiler-plugin/compose-test-tag/applier/plugin/src/main/kotlin/com/vk/compiler/plugin/compose/test/tag/applier/TestTagApplier.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.ir.expressions.IrGetObjectValue import org.jetbrains.kotlin.ir.expressions.IrGetValue import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl import org.jetbrains.kotlin.ir.expressions.impl.IrGetObjectValueImpl -import org.jetbrains.kotlin.ir.interpreter.toIrConst import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.types.classFqName @@ -363,9 +362,13 @@ internal class TestTagApplier( irCall: IrCall, lastFile: IrFile, lastFunction: IrFunction, - ) = "${lastFile.name}-" + - "${lastFunction.name}(${lastFunction.startOffset})-" + - "${irCall.symbol.owner.name}(${irCall.startOffset})" + ) = buildString { + append(lastFile.name) + append("-") + append("${lastFunction.name}(${lastFunction.startOffset})") + append("-") + append("${irCall.symbol.owner.name}(${irCall.startOffset})") + } private fun retrieveArgumentExpression( param: IrValueParameter, @@ -387,7 +390,8 @@ internal class TestTagApplier( val Composable = FqName( "androidx.compose.runtime.Composable") val modifierObjectClassId = ClassId( FqName("androidx.compose.ui"), - Name.identifier("Modifier.Companion") + FqName("Modifier.Companion"), + isLocal = false ) val thenFuncCallableId = CallableId( ClassId(