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

[FIR] Fix JavaClass.modality for annotation classes and enums

Browse Source 
- `JavaClass.modality` should return the correct modality instead of
  requiring the caller to handle annotation classes and enums.
This commit is contained in:
Marco Pennekamp
2023-02-27 18:20:02 +01:00
committed by Space Team
parent 484e5afb59
commit 9cc6809ec6
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt
+1 -1
View File
@@ -245,7 +245,7 @@ abstract class FirJavaFacade(
val visibility = javaClass.visibility val visibility = javaClass.visibility
this@buildJavaClass.visibility = visibility this@buildJavaClass.visibility = visibility
classKind = javaClass.classKind classKind = javaClass.classKind
modality = if (classKind == ClassKind.ANNOTATION_CLASS || classKind == ClassKind.ENUM_CLASS) Modality.FINAL else javaClass.modality modality = javaClass.modality
this.isTopLevel = classId.outerClassId == null this.isTopLevel = classId.outerClassId == null
isStatic = javaClass.isStatic isStatic = javaClass.isStatic
javaPackage = packageCache.getValue(classSymbol.classId.packageFqName) javaPackage = packageCache.getValue(classSymbol.classId.packageFqName)
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt
+1 -3
View File
@@ -8,9 +8,6 @@ package org.jetbrains.kotlin.fir.java
import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirDeclarationDataKey
import org.jetbrains.kotlin.fir.declarations.FirDeclarationDataRegistry
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
import org.jetbrains.kotlin.fir.diagnostics.ConeSimpleDiagnostic import org.jetbrains.kotlin.fir.diagnostics.ConeSimpleDiagnostic
import org.jetbrains.kotlin.fir.diagnostics.DiagnosticKind import org.jetbrains.kotlin.fir.diagnostics.DiagnosticKind
import org.jetbrains.kotlin.fir.expressions.FirArrayOfCall import org.jetbrains.kotlin.fir.expressions.FirArrayOfCall
@@ -39,6 +36,7 @@ internal val JavaModifierListOwner.modality: Modality
internal val JavaClass.modality: Modality internal val JavaClass.modality: Modality
get() = when { get() = when {
isAnnotationType || isEnum -> Modality.FINAL
isSealed -> Modality.SEALED isSealed -> Modality.SEALED
isAbstract -> Modality.ABSTRACT isAbstract -> Modality.ABSTRACT
isFinal -> Modality.FINAL isFinal -> Modality.FINAL