Refactoring: ClassDescriptor.isFinal, no more Modality.isOverridable

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt

@@ -206,7 +206,7 @@ class LazyJavaClassDescriptor(
 
         override fun getAnnotations() = Annotations.EMPTY
 
-        override fun isFinal() = !getModality().isOverridable
+        override fun isFinal(): Boolean = isFinal
 
         override fun isDenotable() = true
 

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

@@ -17,13 +17,13 @@
 package org.jetbrains.kotlin.descriptors
 
 // For sealed classes, isOverridable is false but isOverridableByMembers is true
-enum class Modality private constructor(val isOverridable: Boolean) {
+enum class Modality {
     // THE ORDER OF ENTRIES MATTERS HERE
-    FINAL(false),
+    FINAL,
     // NB: class can be sealed but not function or property
-    SEALED(true),
-    OPEN(true),
-    ABSTRACT(true);
+    SEALED,
+    OPEN,
+    ABSTRACT;
 
     companion object {
 
@@ -39,3 +39,5 @@ enum class Modality private constructor(val isOverridable: Boolean) {
 val CallableMemberDescriptor.isOverridable: Boolean
     get() = modality != Modality.FINAL
 
+val ClassDescriptor.isFinal: Boolean
+    get() = modality == Modality.FINAL

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt

@@ -181,7 +181,7 @@ public class DeserializedClassDescriptor(
 
         override fun getSupertypes() = supertypes()
 
-        override fun isFinal() = !getModality().isOverridable
+        override fun isFinal(): Boolean = isFinal
 
         override fun isDenotable() = true