diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java index de5c478ca7bb..f2de141dcec5 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java @@ -55,8 +55,8 @@ public abstract class ImportClassFixBase classList = new ArrayList<>(classes.length); boolean isAnnotationReference = myReferenceElement.getParent() instanceof PsiAnnotation; for (PsiClass aClass : classes) { @@ -210,16 +209,17 @@ public abstract class ImportClassFixBase 1) { + reduceSuggestedClassesBasedOnDependencyRuleViolation(classList, psiFile); + } - if (classList.size() > 1) { - reduceSuggestedClassesBasedOnDependencyRuleViolation(classList, psiFile); + classes = classList.toArray(PsiClass.EMPTY_ARRAY); + CodeInsightUtil.sortIdenticalShortNamedMembers(classes, myReference); } - - PsiClass[] array = classList.toArray(PsiClass.EMPTY_ARRAY); - CodeInsightUtil.sortIdenticalShortNamedMembers(array, myReference); - return array; + return new CalcInfo(classes, extensionsAllowToChangeFileSilently, myInContent); } public static boolean qualifiedNameAllowsAutoImport(@NotNull PsiFile placeFile, @NotNull PsiClass aClass) {