From 3bcf8658c829090b33cb3ee6c1b1fdf580d40b2a Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Wed, 7 Mar 2018 21:49:42 +0300 Subject: [PATCH] [groovy] clean up --- .../groovy/lang/resolve/ResolveUtil.java | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java index 20fc5d3c0c21..ae60d10f9b1a 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java @@ -6,7 +6,6 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.scope.ElementClassHint; import com.intellij.psi.scope.ElementClassHint.DeclarationKind; @@ -63,8 +62,6 @@ import org.jetbrains.plugins.groovy.lang.resolve.processors.*; import java.util.*; -import static com.intellij.util.containers.ContainerUtil.count; -import static com.intellij.util.containers.ContainerUtil.filter; import static org.jetbrains.plugins.groovy.lang.psi.impl.GrAnnotationUtilKt.hasAnnotation; import static org.jetbrains.plugins.groovy.lang.psi.util.PsiTreeUtilKt.treeWalkUpAndGetSingleElement; import static org.jetbrains.plugins.groovy.lang.resolve.ResolveUtilKt.getDefaultConstructor; @@ -1080,19 +1077,6 @@ public class ResolveUtil { return true; } - public static boolean isMethodCallRef(@NotNull GrReferenceExpression ref) { - final PsiElement element = PsiTreeUtil.skipParentsOfType(ref, GrReferenceExpression.class); - return element instanceof GrMethodCall; - } - - public static boolean isPartOfFQN(@NotNull GrReferenceExpression ref) { - if (ref.hasAt()) return false; - final String name = ref.getReferenceName(); - if (StringUtil.isEmpty(name)) return false; - return Character.isUpperCase(name.charAt(0)) && !isMethodCallRef(ref) || - ref.getParent() instanceof GrReferenceExpression && isPartOfFQN((GrReferenceExpression)ref.getParent()); - } - public static boolean canResolveToMethod(@NotNull GrReferenceExpression ref) { return ref.hasMemberPointer() || ref.getParent() instanceof GrMethodCall; } @@ -1107,25 +1091,6 @@ public class ResolveUtil { return true; } - @NotNull - public static List filterAccessorMethods(@NotNull List candidates) { - return filter(candidates, it -> !(it.getElement() instanceof GrAccessorMethod)); - } - - @NotNull - public static List collapseReflectedMethodsSimple(@NotNull List candidates) { - if (count(candidates, it -> it.getElement() instanceof GrReflectedMethod) < 2) return candidates; - final Set visited = ContainerUtil.newHashSet(); - return ContainerUtil.mapNotNull(candidates, result -> { - final PsiElement element = result.getElement(); - if (!(element instanceof GrReflectedMethod)) return result; - - final GrMethod baseMethod = ((GrReflectedMethod)element).getBaseMethod(); - if (!visited.add(baseMethod)) return null; - return new ElementGroovyResult<>(baseMethod); - }); - } - @NotNull public static List collapseReflectedMethods(Collection candidates) { Set visited = ContainerUtil.newHashSet();