[FIR] Remove isEnumEntry field from FirJavaField
This field isn't used anymore because java enum entry is represented by FirEnumEntry
This commit is contained in:
@@ -212,7 +212,6 @@ class JavaSymbolProvider(
|
|||||||
returnTypeRef = returnType.toFirJavaTypeRef(this@JavaSymbolProvider.session, javaTypeParameterStack)
|
returnTypeRef = returnType.toFirJavaTypeRef(this@JavaSymbolProvider.session, javaTypeParameterStack)
|
||||||
isVar = !javaField.isFinal
|
isVar = !javaField.isFinal
|
||||||
isStatic = javaField.isStatic
|
isStatic = javaField.isStatic
|
||||||
isEnumEntry = javaField.isEnumEntry
|
|
||||||
addAnnotationsFrom(this@JavaSymbolProvider.session, javaField, javaTypeParameterStack)
|
addAnnotationsFrom(this@JavaSymbolProvider.session, javaField, javaTypeParameterStack)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ class FirJavaField @FirImplementationDetail constructor(
|
|||||||
override val isVar: Boolean,
|
override val isVar: Boolean,
|
||||||
override val annotations: MutableList<FirAnnotationCall>,
|
override val annotations: MutableList<FirAnnotationCall>,
|
||||||
override val typeParameters: MutableList<FirTypeParameter>,
|
override val typeParameters: MutableList<FirTypeParameter>,
|
||||||
val isEnumEntry: Boolean
|
|
||||||
) : FirField() {
|
) : FirField() {
|
||||||
init {
|
init {
|
||||||
symbol.bind(this)
|
symbol.bind(this)
|
||||||
@@ -138,7 +137,6 @@ internal class FirJavaFieldBuilder : FirFieldBuilder() {
|
|||||||
var modality: Modality? = null
|
var modality: Modality? = null
|
||||||
lateinit var visibility: Visibility
|
lateinit var visibility: Visibility
|
||||||
var isStatic: Boolean by Delegates.notNull()
|
var isStatic: Boolean by Delegates.notNull()
|
||||||
var isEnumEntry: Boolean by Delegates.notNull()
|
|
||||||
|
|
||||||
override var resolvePhase: FirResolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
|
override var resolvePhase: FirResolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
|
||||||
|
|
||||||
@@ -162,7 +160,6 @@ internal class FirJavaFieldBuilder : FirFieldBuilder() {
|
|||||||
isVar,
|
isVar,
|
||||||
annotations,
|
annotations,
|
||||||
typeParameters,
|
typeParameters,
|
||||||
isEnumEntry
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -98,7 +98,6 @@ class FirSignatureEnhancement(
|
|||||||
isVar = firElement.isVar
|
isVar = firElement.isVar
|
||||||
isStatic = firElement.isStatic
|
isStatic = firElement.isStatic
|
||||||
annotations += firElement.annotations
|
annotations += firElement.annotations
|
||||||
this.isEnumEntry = isEnumEntry
|
|
||||||
}
|
}
|
||||||
return symbol
|
return symbol
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user