support kotlin 2.0.20

VKCOM · Nov 3, 2024 · ac2c29b · ac2c29b
1 parent 596204e
commit ac2c29b
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 7 deletions.
diff --git a/.../com/vk/compiler/plugin/composable/skippability/checker/SkippabilityComponentRegistrar.kt b/.../com/vk/compiler/plugin/composable/skippability/checker/SkippabilityComponentRegistrar.kt
@@ -30,7 +30,14 @@ class SkippabilityComponentRegistrar : ComponentRegistrar {
             }
 
             project.extensionArea.getExtensionPoint(IrGenerationExtension.extensionPointName)
-                .registerExtension(SkippabilityChecker(isStrongSkippingModeEnabled, isStrongSkippingFailFastEnabled, messageCollector, stableTypeMatchers), LoadingOrder.LAST)
+                .registerExtension(
+                    SkippabilityChecker(
+                        isStrongSkippingModeEnabled,
+                        isStrongSkippingFailFastEnabled,
+                        messageCollector,
+                        stableTypeMatchers
+                    ), LoadingOrder.LAST, project
+                )
 
 //            FirExtensionRegistrarAdapter.registerExtension(project, SkippabilityCheckerFirExtensionRegistrar())
         }

diff --git a/...compiler/plugin/compose/source/information/cleaner/SourceInformationComponentRegistrar.kt b/...compiler/plugin/compose/source/information/cleaner/SourceInformationComponentRegistrar.kt
@@ -13,7 +13,7 @@ class SourceInformationComponentRegistrar : ComponentRegistrar {
     override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
         if (configuration.get(SourceInformationCommandLineProcessor.ENABLED, true)) {
             project.extensionArea.getExtensionPoint(IrGenerationExtension.extensionPointName)
-                .registerExtension(SourceInformationIrGeneration(), LoadingOrder.LAST)
+                .registerExtension(SourceInformationIrGeneration(), LoadingOrder.LAST, project)
         }
     }
 

diff --git a/.../plugin/src/main/kotlin/com/vk/compiler/plugin/compose/test/tag/applier/TestTagApplier.kt b/.../plugin/src/main/kotlin/com/vk/compiler/plugin/compose/test/tag/applier/TestTagApplier.kt
@@ -430,6 +430,7 @@ internal class TestTagApplier(
              "$FILENAME_PLACEHOLDER-$PARENT_FUNCTION_NAME_PLACEHOLDER($PARENT_FUNCTION_OFFSET_PLACEHOLDER)-$CALLING_FUNCTION_NAME_PLACEHOLDER($CALLING_FUNCTION_OFFSET_PLACEHOLDER)"
 
          private const val MODIFIER = "androidx.compose.ui.Modifier"
+         private val OUTER_FUNCTION_NAME_PLACEHOLDER_REGEX = "%outer_function_name\\[range=(?<range>.+)]\\[delimiter=(?<delimiter>.+)]\\[prefix=(?<prefix>.+)]\\[suffix=(?<suffix>.+)]%".toRegex()
          private const val MODIFIER_COMPANION = "${MODIFIER}.Companion"
          private val Composable = FqName( "androidx.compose.runtime.Composable")
          private val modifierObjectClassId = ClassId(

diff --git a/...otlin/com/vk/compiler/plugin/compose/test/tag/applier/TestTagApplierComponentRegistrar.kt b/...otlin/com/vk/compiler/plugin/compose/test/tag/applier/TestTagApplierComponentRegistrar.kt
@@ -14,7 +14,7 @@ class TestTagApplierComponentRegistrar : ComponentRegistrar {
     override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
         if (configuration.get(TestTagApplierCommandLineProcessor.ENABLED, true)) {
             project.extensionArea.getExtensionPoint(IrGenerationExtension.extensionPointName)
-                .registerExtension(TestTagApplierIrGeneration(configuration.get(TestTagApplierCommandLineProcessor.TAG_TEMPLATE, DEFAULT_TAG_TEMPLATE)), LoadingOrder.FIRST)
+                .registerExtension(TestTagApplierIrGeneration(configuration.get(TestTagApplierCommandLineProcessor.TAG_TEMPLATE, DEFAULT_TAG_TEMPLATE)), LoadingOrder.FIRST, project)
         }
     }
 

diff --git a/...otlin/com/vk/compiler/plugin/compose/test/tag/cleaner/TestTagCleanerComponentRegistrar.kt b/...otlin/com/vk/compiler/plugin/compose/test/tag/cleaner/TestTagCleanerComponentRegistrar.kt
@@ -13,7 +13,7 @@ class TestTagCleanerComponentRegistrar : ComponentRegistrar {
     override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
         if (configuration.get(TestTagCleanerCommandLineProcessor.ENABLED, true)) {
             project.extensionArea.getExtensionPoint(IrGenerationExtension.extensionPointName)
-                .registerExtension(TestTagCleanerIrGeneration(), LoadingOrder.FIRST)
+                .registerExtension(TestTagCleanerIrGeneration(), LoadingOrder.FIRST, project)
         }
     }
 

diff --git a/.../kotlin/com/vk/compiler/plugin/compose/test/tag/drawer/TestTagDrawerComponentRegistrar.kt b/.../kotlin/com/vk/compiler/plugin/compose/test/tag/drawer/TestTagDrawerComponentRegistrar.kt
@@ -13,7 +13,7 @@ class TestTagDrawerComponentRegistrar : ComponentRegistrar {
     override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
         if (configuration.get(TestTagDrawerCommandLineProcessor.ENABLED, true)) {
             project.extensionArea.getExtensionPoint(IrGenerationExtension.extensionPointName)
-                .registerExtension(TestTagDrawerIrGeneration(), LoadingOrder.FIRST)
+                .registerExtension(TestTagDrawerIrGeneration(), LoadingOrder.FIRST, project)
         }
     }
 

diff --git a/...in/com/vk/compiler/plugin/recompose/highlighter/RecomposeHighlighterComponentRegistrar.kt b/...in/com/vk/compiler/plugin/recompose/highlighter/RecomposeHighlighterComponentRegistrar.kt
@@ -13,7 +13,7 @@ class RecomposeHighlighterComponentRegistrar : ComponentRegistrar {
     override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
         if (configuration.get(RecomposeHighlighterCommandLineProcessor.ENABLED, true)) {
             project.extensionArea.getExtensionPoint(IrGenerationExtension.extensionPointName)
-                .registerExtension(RecomposeHighlighterIrGeneration(), LoadingOrder.FIRST)
+                .registerExtension(RecomposeHighlighterIrGeneration(), LoadingOrder.FIRST, project)
         }
     }
 

diff --git a/.../main/kotlin/com/vk/compiler/plugin/recompose/logger/RecomposeLoggerComponentRegistrar.kt b/.../main/kotlin/com/vk/compiler/plugin/recompose/logger/RecomposeLoggerComponentRegistrar.kt
@@ -15,7 +15,7 @@ class RecomposeLoggerComponentRegistrar : ComponentRegistrar {
             val logModifierChanges = configuration.get(RecomposeLoggerCommandLineProcessor.LOG_MODIFIER_CHANGES, true)
             val logFunctionChanges = configuration.get(RecomposeLoggerCommandLineProcessor.LOG_FUNCTION_CHANGES, true)
             project.extensionArea.getExtensionPoint(IrGenerationExtension.extensionPointName)
-                .registerExtension(RecomposeLoggerIrGeneration(logModifierChanges, logFunctionChanges), LoadingOrder.FIRST)
+                .registerExtension(RecomposeLoggerIrGeneration(logModifierChanges, logFunctionChanges), LoadingOrder.FIRST, project)
         }
     }