From 5ce746f1ec9ce8f4ab221eb4c9533515b639dae8 Mon Sep 17 00:00:00 2001 From: Matthew Gharrity Date: Tue, 30 Mar 2021 20:01:46 +0200 Subject: [PATCH] ULC field has null nameIdentifier KtUltraLightFieldForSourceDeclaration implements PsiField, for which getNameIdentifier() is marked @NonNull, so some clients expect a non-null return value. #KT-45629 Fixed --- .../src/org/jetbrains/kotlin/asJava/classes/ultraLightField.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightField.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightField.kt index 077c5b8efcc..fa04b2d5c00 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightField.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightField.kt @@ -67,6 +67,9 @@ internal class KtUltraLightFieldForSourceDeclaration( ) : KtUltraLightFieldImpl(declaration, name, containingClass, support, modifiers), KtLightFieldForSourceDeclarationSupport { + private val lightIdentifier = KtLightIdentifier(this, declaration) + + override fun getNameIdentifier(): PsiIdentifier = lightIdentifier override fun getText(): String? = kotlinOrigin.text override fun getTextRange(): TextRange = kotlinOrigin.textRange override fun getTextOffset(): Int = kotlinOrigin.textOffset