From 12ed92cd49c16e527e0f1988378b77e8613e0cfe Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 20 Oct 2020 18:51:30 +0300 Subject: [PATCH] FIR IDE: allow getting parent declaration for Java one --- .../components/KtFirSymbolContainingDeclarationProvider.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt index 0110804c1b6..d5d1d4f26fe 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt @@ -25,8 +25,7 @@ internal class KtFirSymbolContainingDeclarationProvider( return when (symbol.origin) { KtSymbolOrigin.SOURCE, KtSymbolOrigin.SOURCE_MEMBER_GENERATED -> getContainingDeclarationForKotlinInSourceSymbol(symbol) - KtSymbolOrigin.LIBRARY -> getContainingDeclarationForLibrarySymbol(symbol) - KtSymbolOrigin.JAVA -> TODO() + KtSymbolOrigin.LIBRARY, KtSymbolOrigin.JAVA -> getContainingDeclarationForLibrarySymbol(symbol) KtSymbolOrigin.SAM_CONSTRUCTOR -> TODO() } } @@ -51,7 +50,7 @@ internal class KtFirSymbolContainingDeclarationProvider( } private fun getContainingDeclarationForLibrarySymbol(symbol: KtSymbolWithKind): KtSymbolWithKind = with(analysisSession) { - require(symbol.origin == KtSymbolOrigin.LIBRARY) + require(symbol.origin == KtSymbolOrigin.LIBRARY || symbol.origin == KtSymbolOrigin.JAVA) check(symbol.symbolKind == KtSymbolKind.MEMBER) val containingClassId = when (symbol) {