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

FIR IDE: do not consider function literal as fqName-having declaration

Browse Source
This commit is contained in:
Ilya Kirillov
2020-12-31 13:13:04 +01:00
parent 1fb33207b8
commit a7903c64f1
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/element/builder/FirElementBuilder.kt
+2
View File
@@ -103,6 +103,7 @@ private fun KtElement.getFirOfClosestParent(cache: Map<KtElement, FirElement>):
} }
// TODO: simplify
internal inline fun PsiElement.getNonLocalContainingOrThisDeclaration(predicate: (KtDeclaration) -> Boolean = { true }): KtNamedDeclaration? { internal inline fun PsiElement.getNonLocalContainingOrThisDeclaration(predicate: (KtDeclaration) -> Boolean = { true }): KtNamedDeclaration? {
var container: PsiElement? = this var container: PsiElement? = this
while (container != null && container !is KtFile) { while (container != null && container !is KtFile) {
@@ -111,6 +112,7 @@ internal inline fun PsiElement.getNonLocalContainingOrThisDeclaration(predicate:
&& container !is KtPrimaryConstructor && container !is KtPrimaryConstructor
&& container.hasFqName() && container.hasFqName()
&& container !is KtEnumEntry && container !is KtEnumEntry
&& container !is KtFunctionLiteral
&& container.containingClassOrObject !is KtEnumEntry && container.containingClassOrObject !is KtEnumEntry
&& predicate(container) && predicate(container)
) { ) {