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

don't separate deprecated methods: 2 applicable methods are not often, then sorting would do the rest

Browse Source 
EA-78558 - assert: IndexAccessValidator.checkAccessingIndexDuringOtherIndexProcessing
This commit is contained in:
Anna Kozlova
2016-02-01 20:48:57 +03:00
parent 628f7f0019
commit 64001d7db0
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java
+5 -14
View File
@@ -30,10 +30,9 @@ import org.jetbrains.annotations.NotNull;
import java.util.*;
abstract class StaticMembersProcessor<T extends PsiMember> implements Processor<T> {
private final MultiMap<PsiClass, T> myDeprecated = new LinkedMultiMap<PsiClass, T>();
private final MultiMap<PsiClass, T> mySuggestions = new LinkedMultiMap<PsiClass, T>();
private final MultiMap<PsiClass, T> mySuggestions = new LinkedMultiMap<>();
private final Map<PsiClass, Boolean> myPossibleClasses = new HashMap<PsiClass, Boolean>();
private final Map<PsiClass, Boolean> myPossibleClasses = new HashMap<>();
private final PsiElement myPlace;
private PsiType myExpectedType;
@@ -47,16 +46,12 @@ abstract class StaticMembersProcessor<T extends PsiMember> implements Processor<
@NotNull
public List<T> getMembersToImport(boolean applicableOnly) {
final List<T> list = new ArrayList<T>();
final List<T> applicableList = new ArrayList<T>();
final List<T> list = new ArrayList<>();
final List<T> applicableList = new ArrayList<>();
for (Map.Entry<PsiClass, Collection<T>> methodEntry : mySuggestions.entrySet()) {
registerMember(methodEntry.getKey(), methodEntry.getValue(), list, applicableList);
}
for (Map.Entry<PsiClass, Collection<T>> deprecatedMethod : myDeprecated.entrySet()) {
registerMember(deprecatedMethod.getKey(), deprecatedMethod.getValue(), list, applicableList);
}
List<T> result = !applicableOnly && applicableList.isEmpty() ? list : applicableList;
for (int i = result.size() - 1; i >= 0; i--) {
ProgressManager.checkCanceled();
@@ -140,17 +135,13 @@ abstract class StaticMembersProcessor<T extends PsiMember> implements Processor<
if (file instanceof PsiJavaFile
//do not show methods from default package
&& !((PsiJavaFile)file).getPackageName().isEmpty()) {
if (JavaCompletionUtil.isEffectivelyDeprecated((PsiDocCommentOwner)member)) {
myDeprecated.putValue(containingClass, member);
return processCondition();
}
mySuggestions.putValue(containingClass, member);
}
return processCondition();
}
private boolean processCondition() {
return mySuggestions.size() + myDeprecated.size() < 50;
return mySuggestions.size() < 50;
}
private void registerMember(PsiClass containingClass,