diff --git a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java index 788206919e2f..551dd15e144b 100644 --- a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java @@ -247,7 +247,7 @@ public class CompilerReferenceServiceImpl extends CompilerReferenceServiceEx imp count); })) .filter(Objects::nonNull) - .collect(Collectors.groupingBy(x -> x.getUnderlying(), Collectors.summarizingInt(x -> x.getOccurrences()))) + .collect(Collectors.groupingBy(x -> x.getUnderlying(), Collectors.summarizingInt(x -> x.getOccurrenceCount()))) .entrySet() .stream() .map(e -> new OccurrencesAware<>(e.getKey(), (int)e.getValue().getSum())) diff --git a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/ChainSearcher.java b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/ChainSearcher.java index 210ab0bbf82c..7d5dbda7b065 100644 --- a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/ChainSearcher.java +++ b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/ChainSearcher.java @@ -80,8 +80,8 @@ public class ChainSearcher { .getVertices() .stream() .map( - signAndWeight -> new OccurrencesAware<>(MethodChain.create(signAndWeight.getUnderlying(), signAndWeight.getOccurrences(), context), - signAndWeight.getOccurrences())) + signAndWeight -> new OccurrencesAware<>(MethodChain.create(signAndWeight.getUnderlying(), signAndWeight.getOccurrenceCount(), context), + signAndWeight.getOccurrenceCount())) .filter(Objects::nonNull) .collect(Collectors.toCollection(LinkedList::new)); @@ -89,7 +89,7 @@ public class ChainSearcher { while (!q.isEmpty()) { ProgressManager.checkCanceled(); OccurrencesAware currentVertex = q.poll(); - int currentVertexDistance = currentVertex.getOccurrences(); + int currentVertexDistance = currentVertex.getOccurrenceCount(); MethodChain currentChain = currentVertex.getUnderlying(); MethodIncompleteSignature headSignature = currentChain.getHeadSignature(); MethodChain currentVertexMethodChain = knownDistance.get(headSignature); @@ -107,12 +107,12 @@ public class ChainSearcher { String targetQName = context.getTarget().getClassQName(); for (OccurrencesAware indexValue : nextMethods) { MethodIncompleteSignature vertex = indexValue.getUnderlying(); - int occurrences = indexValue.getOccurrences(); + int occurrences = indexValue.getOccurrenceCount(); if (vertex.isStatic() || !vertex.getOwner().equals(targetQName)) { int vertexDistance = Math.min(currentVertexDistance, occurrences); MethodChain knownVertexMethodChain = knownDistance.get(vertex); if ((knownVertexMethodChain == null || knownVertexMethodChain.getChainWeight() < vertexDistance)) { - if (currentSignatures.isEmpty() || currentSignatures.last().getOccurrences() < vertexDistance) { + if (currentSignatures.isEmpty() || currentSignatures.last().getOccurrenceCount() < vertexDistance) { if (currentVertexMethodChain.size() < pathMaximalLength - 1) { MethodChain newBestMethodChain = currentVertexMethodChain.continuation(indexValue.getUnderlying(), vertexDistance, context); @@ -138,7 +138,7 @@ public class ChainSearcher { boolean stopChain = sign.getUnderlying().isStatic() || context.hasQualifier(context.resolveQualifierClass(sign.getUnderlying())); if (stopChain) { updated = true; - MethodChain continuation = currentChain.continuation(sign.getUnderlying(), sign.getOccurrences(), context); + MethodChain continuation = currentChain.continuation(sign.getUnderlying(), sign.getOccurrenceCount(), context); if (continuation != null) { result.add(continuation); } @@ -147,9 +147,9 @@ public class ChainSearcher { else { updated = true; MethodChain methodChain = - currentChain.continuation(sign.getUnderlying(), sign.getOccurrences(), context); + currentChain.continuation(sign.getUnderlying(), sign.getOccurrenceCount(), context); if (methodChain != null) { - q.addFirst(new OccurrencesAware<>(methodChain, sign.getOccurrences())); + q.addFirst(new OccurrencesAware<>(methodChain, sign.getOccurrenceCount())); continue; } } diff --git a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/MethodsChainLookupRangingHelper.java b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/MethodChainLookupRangingHelper.java similarity index 99% rename from java/compiler/impl/src/com/intellij/compiler/chainsSearch/MethodsChainLookupRangingHelper.java rename to java/compiler/impl/src/com/intellij/compiler/chainsSearch/MethodChainLookupRangingHelper.java index 01091147b07c..be4ab095b894 100644 --- a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/MethodsChainLookupRangingHelper.java +++ b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/MethodChainLookupRangingHelper.java @@ -40,7 +40,7 @@ import java.util.stream.Collectors; import static com.intellij.psi.CommonClassNames.JAVA_LANG_STRING; -public class MethodsChainLookupRangingHelper { +public class MethodChainLookupRangingHelper { @Nullable public static LookupElement chainToWeightableLookupElement(MethodChain chain, ChainCompletionContext context) { diff --git a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/OccurrencesAware.java b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/OccurrencesAware.java index 4e453c53c871..2576d14159f3 100644 --- a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/OccurrencesAware.java +++ b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/OccurrencesAware.java @@ -30,13 +30,13 @@ public class OccurrencesAware implements Comparable> { return myUnderlying; } - public int getOccurrences() { + public int getOccurrenceCount() { return myOccurrences; } @Override public int compareTo(@NotNull final OccurrencesAware that) { - final int sub = -getOccurrences() + that.getOccurrences(); + final int sub = -getOccurrenceCount() + that.getOccurrenceCount(); if (sub != 0) { return sub; } @@ -45,6 +45,6 @@ public class OccurrencesAware implements Comparable> { @Override public String toString() { - return getOccurrences() + " for " + myUnderlying; + return getOccurrenceCount() + " for " + myUnderlying; } } diff --git a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/SearchInitializer.java b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/SearchInitializer.java index 69ece93e473b..b656ce0b325a 100644 --- a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/SearchInitializer.java +++ b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/SearchInitializer.java @@ -37,7 +37,7 @@ public class SearchInitializer { int bestOccurrences = -1; for (OccurrencesAware indexValue : indexValues) { if (add(indexValue)) { - int occurrences = indexValue.getOccurrences(); + int occurrences = indexValue.getOccurrenceCount(); if (bestOccurrences == -1) { bestOccurrences = occurrences; } @@ -50,7 +50,7 @@ public class SearchInitializer { private boolean add(OccurrencesAware indexValue) { MethodIncompleteSignature methodInvocation = indexValue.getUnderlying(); - int occurrences = indexValue.getOccurrences(); + int occurrences = indexValue.getOccurrenceCount(); MethodChain methodChain = MethodChain.create(indexValue.getUnderlying(), occurrences, myContext); if (methodChain != null) { myChains.put(methodInvocation, Pair.create(methodChain, occurrences)); diff --git a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/completion/MethodChainCompletionContributor.java b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/completion/MethodChainCompletionContributor.java index ec8f94a63863..3a0c8d734d95 100644 --- a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/completion/MethodChainCompletionContributor.java +++ b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/completion/MethodChainCompletionContributor.java @@ -23,7 +23,7 @@ import com.intellij.compiler.backwardRefs.ReferenceIndexUnavailableException; import com.intellij.compiler.chainsSearch.ChainSearchMagicConstants; import com.intellij.compiler.chainsSearch.ChainSearcher; import com.intellij.compiler.chainsSearch.MethodChain; -import com.intellij.compiler.chainsSearch.MethodsChainLookupRangingHelper; +import com.intellij.compiler.chainsSearch.MethodChainLookupRangingHelper; import com.intellij.compiler.chainsSearch.context.ChainCompletionContext; import com.intellij.compiler.chainsSearch.context.ChainSearchTarget; import com.intellij.openapi.application.ApplicationManager; @@ -111,7 +111,7 @@ public class MethodChainCompletionContributor extends CompletionContributor { return searchResult .stream() .filter(ch -> ch.getChainWeight() * ChainSearchMagicConstants.FILTER_RATIO >= maxWeight) - .map(ch -> MethodsChainLookupRangingHelper.chainToWeightableLookupElement(ch, context)) + .map(ch -> MethodChainLookupRangingHelper.chainToWeightableLookupElement(ch, context)) .collect(Collectors.toList()); } diff --git a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java index 10df95e0f945..4efd08ff385a 100644 --- a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java +++ b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java @@ -38,10 +38,10 @@ import java.util.stream.Collectors; import java.util.stream.Stream; public class ChainCompletionContext { - private static final String[] WIDE_USED_CLASS_NAMES = new String [] {CommonClassNames.JAVA_LANG_STRING, + private static final String[] WIDELY_USED_CLASS_NAMES = new String [] {CommonClassNames.JAVA_LANG_STRING, CommonClassNames.JAVA_LANG_OBJECT, CommonClassNames.JAVA_LANG_CLASS}; - private static final Set WIDE_USED_SHORT_NAMES = ContainerUtil.set("String", "Object", "Class"); + private static final Set WIDELY_USED_SHORT_NAMES = ContainerUtil.set("String", "Object", "Class"); @NotNull private final ChainSearchTarget myTarget; @@ -260,12 +260,12 @@ public class ChainCompletionContext { type = type.getDeepComponentType(); if (type instanceof PsiPrimitiveType) return true; if (!(type instanceof PsiClassType)) return false; - if (WIDE_USED_SHORT_NAMES.contains(((PsiClassType)type).getClassName())) return false; + if (WIDELY_USED_SHORT_NAMES.contains(((PsiClassType)type).getClassName())) return false; final PsiClass resolvedClass = ((PsiClassType)type).resolve(); if (resolvedClass == null) return false; final String qName = resolvedClass.getQualifiedName(); if (qName == null) return false; - for (String name : WIDE_USED_CLASS_NAMES) { + for (String name : WIDELY_USED_CLASS_NAMES) { if (name.equals(qName)) { return true; }