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

FIR IDE: allow getting parent declaration for Java one

Browse Source
This commit is contained in:
Ilya Kirillov
2020-10-20 18:51:30 +03:00
parent cbd1ec35ce
commit 12ed92cd49
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt
+2 -3
View File
@@ -25,8 +25,7 @@ internal class KtFirSymbolContainingDeclarationProvider(
return when (symbol.origin) { return when (symbol.origin) {
KtSymbolOrigin.SOURCE, KtSymbolOrigin.SOURCE_MEMBER_GENERATED -> KtSymbolOrigin.SOURCE, KtSymbolOrigin.SOURCE_MEMBER_GENERATED ->
getContainingDeclarationForKotlinInSourceSymbol(symbol) getContainingDeclarationForKotlinInSourceSymbol(symbol)
KtSymbolOrigin.LIBRARY -> getContainingDeclarationForLibrarySymbol(symbol) KtSymbolOrigin.LIBRARY, KtSymbolOrigin.JAVA -> getContainingDeclarationForLibrarySymbol(symbol)
KtSymbolOrigin.JAVA -> TODO()
KtSymbolOrigin.SAM_CONSTRUCTOR -> TODO() KtSymbolOrigin.SAM_CONSTRUCTOR -> TODO()
} }
} }
@@ -51,7 +50,7 @@ internal class KtFirSymbolContainingDeclarationProvider(
} }
private fun getContainingDeclarationForLibrarySymbol(symbol: KtSymbolWithKind): KtSymbolWithKind = with(analysisSession) { 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) check(symbol.symbolKind == KtSymbolKind.MEMBER)
val containingClassId = when (symbol) { val containingClassId = when (symbol) {