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

Check the backing field before checking accessors in KotlinAnnotatedElementsSearcher. This should be faster, and it fixes the problem with IDEA hangs in DataBinding.

Browse Source
This commit is contained in:
Yan Zhulanow
2016-12-29 19:15:28 +03:00
committed by Yan Zhulanow
parent e775cc697e
commit 433dfdd1e8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt
+5 -2
View File
@@ -55,9 +55,12 @@ class KotlinAnnotatedElementsSearcher : QueryExecutor<PsiModifierListOwner, Anno
consumer.process(wrappedMethod) consumer.process(wrappedMethod)
} }
is KtProperty -> { is KtProperty -> {
with (LightClassUtil.getLightClassPropertyMethods(declaration)) { val backingField = LightClassUtil.getLightClassBackingField(declaration)
if (backingField != null) consumer.process(backingField) else all { consumer.process(it) } if (backingField != null) {
return@processAnnotatedMembers consumer.process(backingField)
} }
LightClassUtil.getLightClassPropertyMethods(declaration).all { consumer.process(it) }
} }
else -> true else -> true
} }