From 0e04af463d6e80a96040a88bffc6eeac2ab8a59d Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Mon, 31 Aug 2020 14:57:37 +0300
Subject: [PATCH] Move JvmTypeSpecificityComparator to
 :compiler:resolution.common.jvm

---
 .../JvmTypeSpecificityComparatorDelegate.kt   | 24 +++++++++++++++++++
 .../jvm/JvmTypeSpecificityComparator.kt       | 23 +++---------------
 2 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmTypeSpecificityComparatorDelegate.kt
 rename compiler/{frontend.java => resolution.common.jvm}/src/org/jetbrains/kotlin/resolve/jvm/JvmTypeSpecificityComparator.kt (57%)

diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmTypeSpecificityComparatorDelegate.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmTypeSpecificityComparatorDelegate.kt
new file mode 100644
index 00000000000..4699e3a689b
--- /dev/null
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmTypeSpecificityComparatorDelegate.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.resolve.jvm
+
+import org.jetbrains.kotlin.types.model.TypeSystemInferenceExtensionContextDelegate
+
+/**
+ * We should use delegate context for DI in old frontend. For the FIR we don't have context delegate, so we should use parent class.
+ */
+class JvmTypeSpecificityComparatorDelegate(override val context: TypeSystemInferenceExtensionContextDelegate) : JvmTypeSpecificityComparator(context)
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmTypeSpecificityComparator.kt b/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/JvmTypeSpecificityComparator.kt
similarity index 57%
rename from compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmTypeSpecificityComparator.kt
rename to compiler/resolution.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/JvmTypeSpecificityComparator.kt
index 2c79bae5161..320025113e1 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmTypeSpecificityComparator.kt
+++ b/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/JvmTypeSpecificityComparator.kt
@@ -1,17 +1,6 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2010-2020 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.
  */
 
 package org.jetbrains.kotlin.resolve.jvm
@@ -19,12 +8,6 @@ package org.jetbrains.kotlin.resolve.jvm
 import org.jetbrains.kotlin.resolve.calls.results.TypeSpecificityComparator
 import org.jetbrains.kotlin.types.model.KotlinTypeMarker
 import org.jetbrains.kotlin.types.model.TypeSystemInferenceExtensionContext
-import org.jetbrains.kotlin.types.model.TypeSystemInferenceExtensionContextDelegate
-
-/**
- * We should use delegate context for DI in old frontend. For the FIR we don't have context delegate, so we should use parent class.
- */
-class JvmTypeSpecificityComparatorDelegate(override val context: TypeSystemInferenceExtensionContextDelegate) : JvmTypeSpecificityComparator(context)
 
 open class JvmTypeSpecificityComparator(open val context: TypeSystemInferenceExtensionContext) : TypeSpecificityComparator {
 
@@ -48,4 +31,4 @@ open class JvmTypeSpecificityComparator(open val context: TypeSystemInferenceExt
         // Int! lessSpecific Int
         return true
     }
-}
\ No newline at end of file
+}