From b263e1c924ed1546ad893c9c77657da4357b800e Mon Sep 17 00:00:00 2001 From: Igor Yakovlev Date: Thu, 23 Jul 2020 01:20:17 +0300 Subject: [PATCH] [ULC] Remove nullability annotation for UL backing fields of private props --- .../src/org/jetbrains/kotlin/asJava/lightClassUtils.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt index 46a2912cb54..264130c5772 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.* +import com.intellij.psi.impl.light.LightField import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade @@ -241,6 +242,10 @@ fun fastCheckIsNullabilityApplied(lightElement: KtLightElement<*, PsiModifierLis // backing fields for lateinit props are skipped if (lightElement is KtLightField && annotatedElement is KtProperty && annotatedElement.hasModifier(KtTokens.LATEINIT_KEYWORD)) return false + if (lightElement is KtLightField && (annotatedElement as? KtModifierListOwner)?.isPrivate() == true) { + return false + } + if (annotatedElement is KtParameter) { val containingClassOrObject = annotatedElement.containingClassOrObject if (containingClassOrObject?.isAnnotation() == true) return false