[SLC] SymbolLightClassForFacade: add missing parent to modifier list in case of JvmMultifileClass

This commit is contained in:
Dmitrii Gridin
2023-01-05 12:34:25 +01:00
committed by Space Team
parent 5a081e8291
commit 7dbffa3a1f
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
@@ -62,21 +62,22 @@ class SymbolLightClassForFacade(
private val firstFileInFacade by lazyPub { files.first() } private val firstFileInFacade by lazyPub { files.first() }
private val _modifierList: PsiModifierList by lazyPub { private val _modifierList: PsiModifierList by lazyPub {
if (multiFileClass)
return@lazyPub LightModifierList(manager, KotlinLanguage.INSTANCE, PsiModifier.PUBLIC, PsiModifier.FINAL)
SymbolLightClassModifierList( SymbolLightClassModifierList(
containingDeclaration = this, containingDeclaration = this,
staticModifiers = setOf(PsiModifier.PUBLIC, PsiModifier.FINAL), staticModifiers = setOf(PsiModifier.PUBLIC, PsiModifier.FINAL),
) { modifierList -> ) { modifierList ->
withFileSymbols { fileSymbols -> if (multiFileClass) {
fileSymbols.flatMap { emptyList()
it.computeAnnotations( } else {
modifierList = modifierList, withFileSymbols { fileSymbols ->
nullability = NullabilityType.Unknown, fileSymbols.flatMap {
annotationUseSiteTarget = AnnotationUseSiteTarget.FILE, it.computeAnnotations(
includeAnnotationsWithoutSite = false, modifierList = modifierList,
) nullability = NullabilityType.Unknown,
annotationUseSiteTarget = AnnotationUseSiteTarget.FILE,
includeAnnotationsWithoutSite = false,
)
}
} }
} }
} }