MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed parameters matcher and methods chains comparing

Browse Source
This commit is contained in:
Dmitry Batkovich
2013-10-24 21:02:45 +04:00
parent 5d5b7f3ec0
commit 001723f203
3 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/methodChains/search/ChainsSearcher.java
+9 -1
View File
@@ -151,7 +151,7 @@ public class ChainsSearcher {
}
final MethodsChain methodsChain =
currentVertexUnderlying.second.addEdge(resolved, sign.getUnderlying().getOwner(), sign.getWeight());
if (ParametersMatcher.matchParameters(methodsChain, context).noUnmatched()) {
if (ParametersMatcher.matchParameters(methodsChain, context).noUnmatchedAndHasMatched()) {
updated = true;
q.addFirst(new WeightAware<Pair<MethodIncompleteSignature, MethodsChain>>(
new Pair<MethodIncompleteSignature, MethodsChain>(sign.getUnderlying(), methodsChain), sign.getWeight()));
@@ -221,6 +221,14 @@ public class ChainsSearcher {
}
}
private static int sumWeight(MaxSizeTreeSet<WeightAware<MethodIncompleteSignature>> weightAwareSignatures) {
int weight = 0;
for (WeightAware<MethodIncompleteSignature> weightAware : weightAwareSignatures) {
weight += weightAware.getWeight();
}
return weight;
}
private static boolean doChoose(final SortedSet<UsageIndexValue> bigrams, final int currentWeight, final int maxResultSize) {
if (bigrams.size() == 1) {
return true;
java/java-impl/src/com/intellij/codeInsight/completion/methodChains/search/MethodsChain.java
+22 -17
View File
@@ -2,12 +2,14 @@ package com.intellij.codeInsight.completion.methodChains.search;
import com.intellij.codeInsight.completion.methodChains.completion.context.ChainCompletionContext;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.PsiManager;
import com.intellij.psi.PsiMethod;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import static com.intellij.util.containers.ContainerUtil.reverse;
@@ -81,8 +83,7 @@ public class MethodsChain {
if (thisNext == null || thatNext == null) {
throw new NullPointerException();
}
if (((thisNext.isConstructor() != thatNext.isConstructor()))
|| !thisNext.getName().equals(thatNext.getName())) {
if (((thisNext.isConstructor() != thatNext.isConstructor())) || !thisNext.getName().equals(thatNext.getName())) {
return CompareResult.NOT_EQUAL;
}
}
@@ -94,21 +95,25 @@ public class MethodsChain {
}
final PsiClass leftQualifier = JavaPsiFacade.getInstance(context.getProject()).findClass(left.getQualifierClassName(), context.getResolveScope());
final PsiClass rightQualifier = JavaPsiFacade.getInstance(context.getProject()).findClass(left.getQualifierClassName(), context.getResolveScope());
return hasBaseClass(leftQualifier, rightQualifier, PsiManager.getInstance(context.getProject())) ? CompareResult.EQUAL : CompareResult.NOT_EQUAL;
return hasBaseMethod(left.getPath().get(0), right.getPath().get(0), PsiManager.getInstance(context.getProject()))
? CompareResult.EQUAL
: CompareResult.NOT_EQUAL;
}
private static boolean hasBaseClass(final PsiClass left, final PsiClass right, final PsiManager psiManager) {
//todo so slow
final Set<PsiClass> leftSupers = InheritanceUtil.getSuperClasses(left);
final Set<PsiClass> rightSupers = InheritanceUtil.getSuperClasses(right);
for (final PsiClass leftSuper : leftSupers) {
if (!CommonClassNames.JAVA_LANG_OBJECT.equals(leftSuper.getQualifiedName()) && rightSupers.contains(leftSuper)) {
return true;
private static boolean hasBaseMethod(final PsiMethod[] left, final PsiMethod[] right, final PsiManager psiManager) {
for (PsiMethod rightMethod : right) {
final PsiMethod[] rightSupers = rightMethod.findDeepestSuperMethods();
if (rightSupers.length != 0) {
for (final PsiMethod leftMethod : left) {
final PsiMethod[] leftSupers = leftMethod.findDeepestSuperMethods();
if (leftSupers.length != 0) {
if (psiManager.areElementsEquivalent(leftSupers[0], rightSupers[0])) {
return true;
}
}
}
}
}
return false;
} return false;
}
public enum CompareResult {
java/java-impl/src/com/intellij/codeInsight/completion/methodChains/search/ParametersMatcher.java
+2 -2
View File
@@ -66,8 +66,8 @@ public class ParametersMatcher {
return new MatchResult(getMatched() + other.getMatched(), getUnMatched() + other.getUnMatched());
}
public boolean noUnmatched() {
return myUnMatched == 0;
public boolean noUnmatchedAndHasMatched() {
return myUnMatched == 0 && myMatched != 0;
}
@Override