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

[FIR IDE] LC Fixed nullability for getters

Browse Source
This commit is contained in:
Igor Yakovlev
2020-11-23 22:32:05 +03:00
parent aff90b335c
commit 229c6f97ac
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightAccessorMethodForSymbol.kt
+14 -14
View File
@@ -12,17 +12,13 @@ import org.jetbrains.kotlin.asJava.classes.METHOD_INDEX_FOR_GETTER
import org.jetbrains.kotlin.asJava.classes.METHOD_INDEX_FOR_SETTER import org.jetbrains.kotlin.asJava.classes.METHOD_INDEX_FOR_SETTER
import org.jetbrains.kotlin.asJava.classes.lazyPub import org.jetbrains.kotlin.asJava.classes.lazyPub
import org.jetbrains.kotlin.asJava.elements.FirLightIdentifier import org.jetbrains.kotlin.asJava.elements.FirLightIdentifier
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.idea.frontend.api.fir.analyzeWithSymbolAsContext import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertyAccessorSymbol
import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirPropertyGetterSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertyGetterSymbol
import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySetterSymbol
import org.jetbrains.kotlin.idea.frontend.api.symbols.* import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySymbol
import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.*
import org.jetbrains.kotlin.idea.util.ifTrue import org.jetbrains.kotlin.idea.util.ifTrue
import org.jetbrains.kotlin.idea.util.module
import org.jetbrains.kotlin.load.java.JvmAbi.getterName import org.jetbrains.kotlin.load.java.JvmAbi.getterName
import org.jetbrains.kotlin.load.java.JvmAbi.setterName import org.jetbrains.kotlin.load.java.JvmAbi.setterName
import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtDeclaration
@@ -38,13 +34,14 @@ internal class FirLightAccessorMethodForSymbol(
containingClass, containingClass,
if (propertyAccessorSymbol is KtPropertyGetterSymbol) METHOD_INDEX_FOR_GETTER else METHOD_INDEX_FOR_SETTER if (propertyAccessorSymbol is KtPropertyGetterSymbol) METHOD_INDEX_FOR_GETTER else METHOD_INDEX_FOR_SETTER
) { ) {
private fun String.abiName(firPropertyAccessor: KtPropertyAccessorSymbol) = private val isGetter: Boolean get() = propertyAccessorSymbol is KtPropertyGetterSymbol
if (firPropertyAccessor is KtPropertyGetterSymbol) getterName(this)
else setterName(this) private fun String.abiName() =
if (isGetter) getterName(this) else setterName(this)
private val _name: String by lazyPub { private val _name: String by lazyPub {
val defaultName = containingPropertySymbol.name.identifier.let { val defaultName = containingPropertySymbol.name.identifier.let {
if (containingClass.isAnnotationType) it else it.abiName(propertyAccessorSymbol) if (containingClass.isAnnotationType) it else it.abiName()
} }
containingPropertySymbol.computeJvmMethodName(defaultName, containingClass, accessorSite) containingPropertySymbol.computeJvmMethodName(defaultName, containingClass, accessorSite)
} }
@@ -66,8 +63,11 @@ internal class FirLightAccessorMethodForSymbol(
else AnnotationUseSiteTarget.PROPERTY_SETTER else AnnotationUseSiteTarget.PROPERTY_SETTER
private val _annotations: List<PsiAnnotation> by lazyPub { private val _annotations: List<PsiAnnotation> by lazyPub {
val nullabilityType = containingPropertySymbol.type
val nullabilityType = if (isGetter) containingPropertySymbol.type
.getTypeNullability(containingPropertySymbol, FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) .getTypeNullability(containingPropertySymbol, FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE)
else NullabilityType.Unknown
containingPropertySymbol.computeAnnotations( containingPropertySymbol.computeAnnotations(
parent = this, parent = this,
nullability = nullabilityType, nullability = nullabilityType,
@@ -121,7 +121,7 @@ internal class FirLightAccessorMethodForSymbol(
override fun getNameIdentifier(): PsiIdentifier = _identifier override fun getNameIdentifier(): PsiIdentifier = _identifier
private val _returnedType: PsiType? by lazyPub { private val _returnedType: PsiType? by lazyPub {
if (propertyAccessorSymbol !is KtPropertyGetterSymbol) return@lazyPub PsiType.VOID if (!isGetter) return@lazyPub PsiType.VOID
return@lazyPub containingPropertySymbol.type.asPsiType( return@lazyPub containingPropertySymbol.type.asPsiType(
context = containingPropertySymbol, context = containingPropertySymbol,
parent = this@FirLightAccessorMethodForSymbol, parent = this@FirLightAccessorMethodForSymbol,