From 36a154507e71e3c43f8ba4e5dfc92b3a313f4192 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Wed, 8 Jun 2022 12:16:14 +0300
Subject: [PATCH] [Parcelize] Remove dependency from backend module to k2
 module

This is needed to avoid dependencies on FIR classes inside Parcelize IDE
  plugin
---
 .../parcelize-compiler/parcelize.backend/build.gradle.kts     | 1 -
 .../kotlin/parcelize/ir/ParcelizeFirIrTransformer.kt          | 4 ++--
 .../org/jetbrains/kotlin/parcelize/fir/ParcelizePluginKey.kt} | 4 ++--
 .../kotlin/parcelize/fir/FirParcelizeDeclarationGenerator.kt  | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename plugins/parcelize/parcelize-compiler/{parcelize.k2/src/org/jetbrains/kotlin/parcelize/fir/FirParcelizePluginKey.kt => parcelize.common/src/org/jetbrains/kotlin/parcelize/fir/ParcelizePluginKey.kt} (72%)

diff --git a/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts b/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts
index 8ee691fa134..e147bb20237 100644
--- a/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts
+++ b/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts
@@ -8,7 +8,6 @@ plugins {
 dependencies {
     implementation(project(":plugins:parcelize:parcelize-compiler:parcelize.common"))
     implementation(project(":plugins:parcelize:parcelize-compiler:parcelize.k1"))
-    implementation(project(":plugins:parcelize:parcelize-compiler:parcelize.k2"))
 
     compileOnly(project(":compiler:backend"))
     compileOnly(project(":compiler:ir.backend.common"))
diff --git a/plugins/parcelize/parcelize-compiler/parcelize.backend/src/org/jetbrains/kotlin/parcelize/ir/ParcelizeFirIrTransformer.kt b/plugins/parcelize/parcelize-compiler/parcelize.backend/src/org/jetbrains/kotlin/parcelize/ir/ParcelizeFirIrTransformer.kt
index e577d2e433d..a0157e0835f 100644
--- a/plugins/parcelize/parcelize-compiler/parcelize.backend/src/org/jetbrains/kotlin/parcelize/ir/ParcelizeFirIrTransformer.kt
+++ b/plugins/parcelize/parcelize-compiler/parcelize.backend/src/org/jetbrains/kotlin/parcelize/ir/ParcelizeFirIrTransformer.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.ir.util.functions
 import org.jetbrains.kotlin.ir.util.render
 import org.jetbrains.kotlin.parcelize.ParcelizeNames.PARCELER_FQN
 import org.jetbrains.kotlin.parcelize.ParcelizeSyntheticComponent
-import org.jetbrains.kotlin.parcelize.fir.FirParcelizePluginKey
+import org.jetbrains.kotlin.parcelize.fir.ParcelizePluginKey
 
 class ParcelizeFirIrTransformer(
     context: IrPluginContext,
@@ -47,7 +47,7 @@ class ParcelizeFirIrTransformer(
 
         for (function in declaration.functions) {
             val origin = function.origin
-            if (origin !is GeneratedByPlugin || origin.pluginKey != FirParcelizePluginKey) continue
+            if (origin !is GeneratedByPlugin || origin.pluginKey != ParcelizePluginKey) continue
             when (function.name.identifier) {
                 ParcelizeSyntheticComponent.ComponentKind.DESCRIBE_CONTENTS.methodName -> {
                     function.generateDescribeContentsBody(parcelableProperties)
diff --git a/plugins/parcelize/parcelize-compiler/parcelize.k2/src/org/jetbrains/kotlin/parcelize/fir/FirParcelizePluginKey.kt b/plugins/parcelize/parcelize-compiler/parcelize.common/src/org/jetbrains/kotlin/parcelize/fir/ParcelizePluginKey.kt
similarity index 72%
rename from plugins/parcelize/parcelize-compiler/parcelize.k2/src/org/jetbrains/kotlin/parcelize/fir/FirParcelizePluginKey.kt
rename to plugins/parcelize/parcelize-compiler/parcelize.common/src/org/jetbrains/kotlin/parcelize/fir/ParcelizePluginKey.kt
index 6deb75259b0..d09e55583ef 100644
--- a/plugins/parcelize/parcelize-compiler/parcelize.k2/src/org/jetbrains/kotlin/parcelize/fir/FirParcelizePluginKey.kt
+++ b/plugins/parcelize/parcelize-compiler/parcelize.common/src/org/jetbrains/kotlin/parcelize/fir/ParcelizePluginKey.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.parcelize.fir
 
 import org.jetbrains.kotlin.GeneratedDeclarationKey
 
-object FirParcelizePluginKey : GeneratedDeclarationKey() {
+object ParcelizePluginKey : GeneratedDeclarationKey() {
     override fun toString(): String {
         return "FirParcelize"
     }
diff --git a/plugins/parcelize/parcelize-compiler/parcelize.k2/src/org/jetbrains/kotlin/parcelize/fir/FirParcelizeDeclarationGenerator.kt b/plugins/parcelize/parcelize-compiler/parcelize.k2/src/org/jetbrains/kotlin/parcelize/fir/FirParcelizeDeclarationGenerator.kt
index 3a86692efec..d2d48dac706 100644
--- a/plugins/parcelize/parcelize-compiler/parcelize.k2/src/org/jetbrains/kotlin/parcelize/fir/FirParcelizeDeclarationGenerator.kt
+++ b/plugins/parcelize/parcelize-compiler/parcelize.k2/src/org/jetbrains/kotlin/parcelize/fir/FirParcelizeDeclarationGenerator.kt
@@ -179,7 +179,7 @@ class FirParcelizeDeclarationGenerator(session: FirSession) : FirDeclarationGene
     }
 
     private val key: GeneratedDeclarationKey
-        get() = FirParcelizePluginKey
+        get() = ParcelizePluginKey
 
     override fun FirDeclarationPredicateRegistrar.registerPredicates() {
         register(PREDICATE)