azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FE10 analysis API: don't count static members of final class as final

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-05-27 10:05:20 +02:00
committed by Space
parent 446ee943e2
commit ef5cfab655
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/base/Kt1DescUtils.kt
+5 -5
View File
@@ -26,10 +26,7 @@ import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
import org.jetbrains.kotlin.descriptors.impl.* import org.jetbrains.kotlin.descriptors.impl.*
import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor import org.jetbrains.kotlin.load.java.descriptors.*
import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor
import org.jetbrains.kotlin.load.java.descriptors.JavaForKotlinOverridePropertyDescriptor
import org.jetbrains.kotlin.load.java.descriptors.JavaPropertyDescriptor
import org.jetbrains.kotlin.load.java.sources.JavaSourceElement import org.jetbrains.kotlin.load.java.sources.JavaSourceElement
import org.jetbrains.kotlin.load.kotlin.toSourceElement import org.jetbrains.kotlin.load.kotlin.toSourceElement
import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.CallableId
@@ -352,7 +349,10 @@ internal val MemberDescriptor.ktModality: Modality
if (selfModality == Modality.OPEN) { if (selfModality == Modality.OPEN) {
val containingDeclaration = this.containingDeclaration val containingDeclaration = this.containingDeclaration
if (containingDeclaration is ClassDescriptor && containingDeclaration.modality == Modality.FINAL) { if (containingDeclaration is ClassDescriptor && containingDeclaration.modality == Modality.FINAL) {
return Modality.FINAL if (this !is CallableMemberDescriptor || dispatchReceiverParameter != null) {
// Non-static open callables in final class are counted as final (to match FIR)
return Modality.FINAL
}
} }
} }