From 719d5da641ed7ce9de4c43f01f7bf6371797f27e Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Mon, 1 Jun 2020 16:51:18 +0700
Subject: [PATCH] [Commonizer] Move some extension functions into
 CirFunctionOrProperty

---
 .../commonizer/cir/CirFunctionOrProperty.kt      | 16 ++++++++--------
 .../core/AbstractFunctionOrPropertyCommonizer.kt |  1 -
 .../commonizer/core/VisibilityCommonizer.kt      |  1 -
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt
index 8e1a8c0fc26..1b6c764d27e 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt
@@ -22,12 +22,12 @@ interface CirFunctionOrProperty :
     val extensionReceiver: CirExtensionReceiver?
     val returnType: CirType
     val kind: CallableMemberDescriptor.Kind
+
+    fun isNonAbstractMemberInInterface(): Boolean =
+        modality != Modality.ABSTRACT && containingClassDetails?.kind == ClassKind.INTERFACE
+
+    fun isVirtual(): Boolean =
+        visibility != Visibilities.PRIVATE
+                && modality != Modality.FINAL
+                && !(containingClassDetails?.modality == Modality.FINAL && containingClassDetails?.kind != ClassKind.ENUM_CLASS)
 }
-
-fun CirFunctionOrProperty.isNonAbstractMemberInInterface(): Boolean =
-    modality != Modality.ABSTRACT && containingClassDetails?.kind == ClassKind.INTERFACE
-
-fun CirFunctionOrProperty.isVirtual(): Boolean =
-    visibility != Visibilities.PRIVATE
-            && modality != Modality.FINAL
-            && !(containingClassDetails?.modality == Modality.FINAL && containingClassDetails?.kind != ClassKind.ENUM_CLASS)
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt
index 1c53eadbf0a..cad31c5d08d 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DELEGATION
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirFunctionOrProperty
-import org.jetbrains.kotlin.descriptors.commonizer.cir.isNonAbstractMemberInInterface
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirClassifiersCache
 import org.jetbrains.kotlin.name.Name
 
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt
index c8992018e45..9ca4ab754bd 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirDeclarationWithVisibility
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirFunctionOrProperty
-import org.jetbrains.kotlin.descriptors.commonizer.cir.isVirtual
 
 abstract class VisibilityCommonizer(private val allowPrivate: Boolean) : Commonizer<CirDeclarationWithVisibility, Visibility> {