From b2df33aebd28bd7eaa097ad8645fd37c7fabacfe Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Mon, 15 Aug 2016 20:53:20 +0300 Subject: [PATCH] [groovy] return proper PsiElement type name in FU (IDEA-142282) --- .../groovy/findUsages/GroovyFindUsagesProvider.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyFindUsagesProvider.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyFindUsagesProvider.java index 8c57cf8dc588..b8bd2dc05019 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyFindUsagesProvider.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyFindUsagesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.groovy.findUsages; +import com.intellij.lang.LangBundle; import com.intellij.lang.cacheBuilder.WordsScanner; import com.intellij.lang.findUsages.FindUsagesProvider; import com.intellij.psi.*; @@ -24,6 +25,10 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrLabeledStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable; import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock; +import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrAnnotationTypeDefinition; +import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrEnumTypeDefinition; +import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrInterfaceDefinition; +import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTraitTypeDefinition; import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrBindingVariable; import org.jetbrains.plugins.groovy.refactoring.rename.PropertyForRename; @@ -54,6 +59,10 @@ public class GroovyFindUsagesProvider implements FindUsagesProvider { @Override @NotNull public String getType(@NotNull PsiElement element) { + if (element instanceof GrTraitTypeDefinition) return "trait"; + if (element instanceof GrInterfaceDefinition) return LangBundle.message("java.terms.interface"); + if (element instanceof GrAnnotationTypeDefinition) return LangBundle.message("java.terms.annotation.interface"); + if (element instanceof GrEnumTypeDefinition) return LangBundle.message("java.terms.enum"); if (element instanceof PsiClass) return "class"; if (element instanceof PsiMethod) return "method"; if (element instanceof PsiField) return "field";