Extract some classes from descriptors module to :core:common

This is needed to remove dependencies from fir modules to
  `:core:descriptors` module

What was extracted:
- Modality
- ClassKind
- org.jetbrains.kotlin.name package

build.gradle.kts

@@ -265,6 +265,7 @@ extra["compilerModules"] = arrayOf(
     ":kotlin-build-common",
     ":core:metadata",
     ":core:metadata.jvm",
+    ":core:descriptors.common",
     ":core:descriptors",
     ":core:descriptors.jvm",
     ":core:descriptors.runtime",
@@ -296,6 +297,7 @@ extra["compilerModulesForJps"] = listOf(
     ":kotlin-compiler-runner",
     ":daemon-common",
     ":daemon-common-new",
+    ":core:descriptors.common",
     ":core:descriptors",
     ":core:descriptors.jvm",
     ":idea:idea-jps-common",

compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java

@@ -73,7 +73,7 @@ import static org.jetbrains.kotlin.codegen.serialization.JvmSerializationBinding
 import static org.jetbrains.kotlin.codegen.state.KotlinTypeMapper.isAccessor;
 import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DECLARATION;
 import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DELEGATION;
-import static org.jetbrains.kotlin.descriptors.ModalityKt.isOverridable;
+import static org.jetbrains.kotlin.descriptors.ModalityUtilsKt.isOverridable;
 import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.getSourceFromDescriptor;
 import static org.jetbrains.kotlin.resolve.DescriptorUtils.*;
 import static org.jetbrains.kotlin.resolve.inline.InlineOnlyKt.isInlineOnlyPrivateInBytecode;

compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java

@@ -641,7 +641,7 @@ public class BodyResolver {
                         trace.report(SEALED_SUPERTYPE_IN_LOCAL_CLASS.on(typeReference));
                     }
                 }
-                else if (ModalityKt.isFinalOrEnum(classDescriptor)) {
+                else if (ModalityUtilsKt.isFinalOrEnum(classDescriptor)) {
                     trace.report(FINAL_SUPERTYPE.on(typeReference));
                 }
                 else if (KotlinBuiltIns.isEnum(classDescriptor)) {

core/descriptors.common/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
+
+dependencies {
+    compile(project(":core:util.runtime"))
+    compile(project(":core:type-system"))
+    compile(kotlinStdlib())
+    compile(project(":kotlin-annotations-jvm"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.6"
+    targetCompatibility = "1.6"
+}

core/descriptors.common/src/org/jetbrains/kotlin/descriptors/Modality.kt

@@ -0,0 +1,26 @@
+/*
+ * 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.descriptors
+
+// For sealed classes, isOverridable is false but isOverridableByMembers is true
+enum class Modality {
+    // THE ORDER OF ENTRIES MATTERS HERE
+    FINAL,
+    // NB: class can be sealed but not function or property
+    SEALED,
+    OPEN,
+    ABSTRACT;
+
+    companion object {
+
+        // NB: never returns SEALED
+        fun convertFromFlags(abstract: Boolean, open: Boolean): Modality {
+            if (abstract) return ABSTRACT
+            if (open) return OPEN
+            return FINAL
+        }
+    }
+}

core/descriptors/build.gradle.kts

@@ -7,6 +7,7 @@ jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
+    compile(project(":core:descriptors.common"))
     compile(project(":core:util.runtime"))
     compile(project(":core:type-system"))
     compile(kotlinStdlib())

core/descriptors/src/org/jetbrains/kotlin/descriptors/ModalityUtils.kt

@@ -18,26 +18,6 @@ package org.jetbrains.kotlin.descriptors
 
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 
-// For sealed classes, isOverridable is false but isOverridableByMembers is true
-enum class Modality {
-    // THE ORDER OF ENTRIES MATTERS HERE
-    FINAL,
-    // NB: class can be sealed but not function or property
-    SEALED,
-    OPEN,
-    ABSTRACT;
-
-    companion object {
-
-        // NB: never returns SEALED
-        fun convertFromFlags(abstract: Boolean, open: Boolean): Modality {
-            if (abstract) return ABSTRACT
-            if (open) return OPEN
-            return FINAL
-        }
-    }
-}
-
 val CallableMemberDescriptor.isOverridable: Boolean
     get() = visibility != Visibilities.PRIVATE
             && modality != Modality.FINAL

core/descriptors/src/org/jetbrains/kotlin/types/AbstractClassTypeConstructor.java

@@ -58,7 +58,7 @@ public abstract class AbstractClassTypeConstructor extends AbstractTypeConstruct
     @Override
     public final boolean isFinal() {
         ClassDescriptor descriptor = getDeclarationDescriptor();
-        return ModalityKt.isFinalClass(descriptor) && !descriptor.isExpect();
+        return ModalityUtilsKt.isFinalClass(descriptor) && !descriptor.isExpect();
     }
 
     @NotNull

js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java

@@ -131,7 +131,7 @@ public final class JsDescriptorUtils {
 
     public static boolean sideEffectsPossibleOnRead(@NotNull PropertyDescriptor property) {
         return DynamicCallsKt.isDynamic(property) || !isDefaultAccessor(property.getGetter()) ||
-               ModalityKt.isOverridableOrOverrides(property) || isStaticInitializationPossible(property);
+               ModalityUtilsKt.isOverridableOrOverrides(property) || isStaticInitializationPossible(property);
     }
 
     private static boolean isStaticInitializationPossible(PropertyDescriptor property) {
@@ -144,7 +144,7 @@ public final class JsDescriptorUtils {
                isDefaultAccessor(propertyDescriptor.getGetter()) &&
                isDefaultAccessor(propertyDescriptor.getSetter()) &&
                !TranslationUtils.shouldAccessViaFunctions(propertyDescriptor) &&
-               !ModalityKt.isOverridableOrOverrides(propertyDescriptor);
+               !ModalityUtilsKt.isOverridableOrOverrides(propertyDescriptor);
     }
 
     @NotNull

js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java

@@ -105,7 +105,7 @@ public final class TranslationUtils {
     @NotNull
     private static JsPropertyInitializer translateExtensionFunctionAsEcma5DataDescriptor(@NotNull JsExpression functionExpression,
             @NotNull FunctionDescriptor descriptor, @NotNull TranslationContext context) {
-        JsObjectLiteral meta = createDataDescriptor(functionExpression, ModalityKt.isOverridable(descriptor), false);
+        JsObjectLiteral meta = createDataDescriptor(functionExpression, ModalityUtilsKt.isOverridable(descriptor), false);
         return new JsPropertyInitializer(context.getNameForDescriptor(descriptor).makeRef(), meta);
     }
 
@@ -420,9 +420,9 @@ public final class TranslationUtils {
 
     public static boolean isOverridableFunctionWithDefaultParameters(@NotNull FunctionDescriptor descriptor) {
         return hasOrInheritsParametersWithDefaultValue(descriptor) &&
-                !(descriptor instanceof ConstructorDescriptor) &&
-                descriptor.getContainingDeclaration() instanceof ClassDescriptor &&
-                ModalityKt.isOverridable(descriptor);
+               !(descriptor instanceof ConstructorDescriptor) &&
+               descriptor.getContainingDeclaration() instanceof ClassDescriptor &&
+               ModalityUtilsKt.isOverridable(descriptor);
     }
 
     @NotNull

libraries/reflect/build.gradle.kts

@@ -49,6 +49,7 @@ dependencies {
     embedded(project(":core:metadata"))
     embedded(project(":core:metadata.jvm"))
     embedded(project(":core:descriptors"))
+    embedded(project(":core:descriptors.common"))
     embedded(project(":core:descriptors.jvm"))
     embedded(project(":core:deserialization"))
     embedded(project(":core:descriptors.runtime"))
@@ -158,6 +159,7 @@ val relocateCoreSources by task<Copy> {
     }
 
     from("$core/descriptors/src")
+    from("$core/descriptors.common/src")
     from("$core/descriptors.jvm/src")
     from("$core/descriptors.runtime/src")
     from("$core/deserialization/src")

prepare/idea-plugin/build.gradle.kts

@@ -28,6 +28,7 @@ val projectsToShadow by extra(listOf(
         ":core:metadata",
         ":core:metadata.jvm",
         ":core:descriptors",
+        ":core:descriptors.common",
         ":core:descriptors.jvm",
         ":core:deserialization",
         ":idea:jvm-debugger:eval4j",

settings.gradle

@@ -149,6 +149,7 @@ include ":benchmarks",
         ":native:kotlin-klib-commonizer-embeddable",
         ":jps-plugin",
         ":kotlin-jps-plugin",
+        ":core:descriptors.common",
         ":core:descriptors",
         ":core:type-system",
         ":core:descriptors.jvm",