From e462a97c64aa4e8885ec8f8ab77e0416c1d49c15 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 25 Aug 2016 19:02:59 +0200
Subject: [PATCH] show two levels of hierarchy when grouping find usages by
 file structure  #KT-9019 Fixed  #KT-10178 Fixed

---
 idea/src/META-INF/plugin.xml                  |  1 +
 .../KotlinDeclarationGroupRuleProvider.kt     | 45 ++++++++++---------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 4030adc4034..04b8ef604a2 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -339,6 +339,7 @@
     <lang.elementManipulator forClass="org.jetbrains.kotlin.psi.KtStringTemplateExpression"
                              implementationClass="org.jetbrains.kotlin.psi.psiUtil.KtStringTemplateExpressionManipulator"/>
     <fileStructureGroupRuleProvider implementation="org.jetbrains.kotlin.idea.findUsages.KotlinDeclarationGroupRuleProvider"/>
+    <fileStructureGroupRuleProvider implementation="org.jetbrains.kotlin.idea.findUsages.KotlinDeclarationSecondLevelGroupRuleProvider"/>
     <importFilteringRule implementation="org.jetbrains.kotlin.idea.findUsages.KotlinImportFilteringRule"/>
     <lang.refactoringSupport language="kotlin" implementationClass="org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSupportProvider"/>
     <lang.surroundDescriptor language="kotlin"
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinDeclarationGroupRuleProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinDeclarationGroupRuleProvider.kt
index f2ae44952b5..87fb4fe4825 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinDeclarationGroupRuleProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinDeclarationGroupRuleProvider.kt
@@ -16,33 +16,36 @@
 
 package org.jetbrains.kotlin.idea.findUsages
 
-import com.intellij.usages.rules.PsiElementUsage
-import com.intellij.usages.UsageGroup
-import com.intellij.usages.Usage
-import com.intellij.psi.util.PsiTreeUtil
-import com.intellij.usages.rules.UsageGroupingRule
-import org.jetbrains.kotlin.psi.KtNamedDeclaration
-import com.intellij.usages.PsiNamedElementUsageGroupBase
-import org.jetbrains.kotlin.psi.KtFile
-import com.intellij.usages.impl.FileStructureGroupRuleProvider
 import com.intellij.openapi.project.Project
+import com.intellij.usages.PsiNamedElementUsageGroupBase
+import com.intellij.usages.Usage
+import com.intellij.usages.UsageGroup
+import com.intellij.usages.impl.FileStructureGroupRuleProvider
+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.psiUtil.parents
 
-class KotlinDeclarationGroupRuleProvider : FileStructureGroupRuleProvider {
-    class KotlinDeclarationGroupingRule : UsageGroupingRule {
-        override fun groupUsage(usage: Usage): UsageGroup? {
-            val element = (usage as? PsiElementUsage)?.element
-            if (element == null) return null
+class KotlinDeclarationGroupingRule(val level: Int) : 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
+        val containingFile = element.containingFile
+        if (containingFile !is KtFile) return null
 
-            return PsiTreeUtil.getTopmostParentOfType(element, KtNamedDeclaration::class.java)?.let { container ->
-                PsiNamedElementUsageGroupBase(container)
-            }
+        val parentList = element.parents.filterIsInstance<KtNamedDeclaration>().toList()
+        if (parentList.size <= level) {
+            return null
         }
+        return PsiNamedElementUsageGroupBase(parentList[parentList.size - level - 1])
     }
-
-    override fun getUsageGroupingRule(project: Project): UsageGroupingRule = KotlinDeclarationGroupingRule()
 }
 
+class KotlinDeclarationGroupRuleProvider : FileStructureGroupRuleProvider {
+    override fun getUsageGroupingRule(project: Project): UsageGroupingRule = KotlinDeclarationGroupingRule(0)
+}
 
+class KotlinDeclarationSecondLevelGroupRuleProvider : FileStructureGroupRuleProvider {
+    override fun getUsageGroupingRule(project: Project): UsageGroupingRule = KotlinDeclarationGroupingRule(1)
+}