From c45fbce5461dba17fecc414b00de7dfe8f7b359d Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Sun, 24 Nov 2019 16:13:36 +0300 Subject: [PATCH] don't use BreadcrumbsInfoProvider + cleanup GroovyBreadcrumbsInfoProvider GitOrigin-RevId: 85cc26468c2463595d106f528501db1d90600679 --- .../groovy/editor/GroovyBreadcrumbsInfoProvider.kt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyBreadcrumbsInfoProvider.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyBreadcrumbsInfoProvider.kt index ce8e1045abf2..32f3f106d492 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyBreadcrumbsInfoProvider.kt +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyBreadcrumbsInfoProvider.kt @@ -5,11 +5,11 @@ import com.intellij.lang.Language import com.intellij.psi.ElementDescriptionUtil import com.intellij.psi.PsiElement import com.intellij.refactoring.util.RefactoringDescriptionLocation.WITH_PARENT -import com.intellij.xml.breadcrumbs.BreadcrumbsInfoProvider +import com.intellij.ui.breadcrumbs.BreadcrumbsProvider import org.jetbrains.plugins.groovy.GroovyLanguage +import org.jetbrains.plugins.groovy.lang.psi.api.GrFunctionalExpression import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariableDeclaration -import org.jetbrains.plugins.groovy.lang.psi.api.GrFunctionalExpression import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrMethodCall import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrAnonymousClassDefinition @@ -17,13 +17,8 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrEn import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMember import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod -class GroovyBreadcrumbsInfoProvider : BreadcrumbsInfoProvider() { - - private companion object { - val ourLanguages: Array = arrayOf(GroovyLanguage) - } - - override fun getLanguages(): Array = ourLanguages +class GroovyBreadcrumbsInfoProvider : BreadcrumbsProvider { + override fun getLanguages(): Array = arrayOf(GroovyLanguage) override fun acceptElement(e: PsiElement): Boolean = when (e) { is GrVariableDeclaration -> e.variables.singleOrNull() is GrField