From f783ba7573e4c2feca0ac7dde4b4d0252b3e1f28 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 27 Oct 2016 14:30:51 +0200 Subject: [PATCH] Exclude local variables from file structure grouping (KT-14363) --- .../idea/findUsages/KotlinDeclarationGroupRuleProvider.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinDeclarationGroupRuleProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinDeclarationGroupRuleProvider.kt index 9c841d80e0e..aebd60938a7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinDeclarationGroupRuleProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinDeclarationGroupRuleProvider.kt @@ -25,16 +25,16 @@ import com.intellij.usages.rules.PsiElementUsage import com.intellij.usages.rules.UsageGroupingRule import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtNamedDeclaration +import org.jetbrains.kotlin.psi.KtProperty import org.jetbrains.kotlin.psi.psiUtil.parents class KotlinDeclarationGroupingRule(val level: Int = 0) : UsageGroupingRule { override fun groupUsage(usage: Usage): UsageGroup? { val element = (usage as? PsiElementUsage)?.element ?: return null - val containingFile = element.containingFile - if (containingFile !is KtFile) return null + if (element.containingFile !is KtFile) return null - val parentList = element.parents.filterIsInstance().toList() + val parentList = element.parents.filterIsInstance().filterNot { it is KtProperty && it.isLocal }.toList() if (parentList.size <= level) { return null }