diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ClassCanBeRecordInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ClassCanBeRecordInspection.java index bce41ea77105..d6084a0a9e8a 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ClassCanBeRecordInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ClassCanBeRecordInspection.java @@ -73,7 +73,7 @@ public final class ClassCanBeRecordInspection extends BaseInspection implements boolean suggestQuickFix = (boolean)infos[0]; if (suggestQuickFix) { - fixes.add(new ConvertToRecordFix(true, suggestAccessorsRenaming, myIgnoredAnnotations)); + fixes.add(new ConvertToRecordFix(suggestAccessorsRenaming, myIgnoredAnnotations)); PsiClass psiClass = ObjectUtils.tryCast(infos[1], PsiClass.class); if (psiClass != null) { PsiAnnotation[] annotations = psiClass.getAnnotations(); diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConvertToRecordFix.java b/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConvertToRecordFix.java index 95084ab6560d..e031c874e37a 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConvertToRecordFix.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConvertToRecordFix.java @@ -39,12 +39,10 @@ import static com.intellij.psi.CommonClassNames.JAVA_LANG_OBJECT; import static com.intellij.psi.PsiModifier.*; public class ConvertToRecordFix extends InspectionGadgetsFix { - private final boolean myShowAffectedMembers; private final boolean mySuggestAccessorsRenaming; private final @NotNull List myIgnoredAnnotations; - ConvertToRecordFix(boolean showAffectedMembers, boolean suggestAccessorsRenaming, @NotNull List ignoredAnnotations) { - myShowAffectedMembers = showAffectedMembers; + ConvertToRecordFix(boolean suggestAccessorsRenaming, @NotNull List ignoredAnnotations) { mySuggestAccessorsRenaming = suggestAccessorsRenaming; myIgnoredAnnotations = ignoredAnnotations; } @@ -77,7 +75,7 @@ public class ConvertToRecordFix extends InspectionGadgetsFix { RecordCandidate recordCandidate = getClassDefinition(psiClass, mySuggestAccessorsRenaming, myIgnoredAnnotations); if (recordCandidate == null) return null; - return new ConvertToRecordProcessor(recordCandidate, myShowAffectedMembers); + return new ConvertToRecordProcessor(recordCandidate); } @Override diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConvertToRecordProcessor.java b/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConvertToRecordProcessor.java index aa5d3a97f530..10ac3d905608 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConvertToRecordProcessor.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConvertToRecordProcessor.java @@ -47,14 +47,12 @@ final class ConvertToRecordProcessor extends BaseRefactoringProcessor { private static final CallMatcher OBJECT_HASHCODE = CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_OBJECT, "hashCode").parameterCount(0); private final RecordCandidate myRecordCandidate; - private final boolean myShowAffectedMembers; private final Map myAllRenames = new LinkedHashMap<>(); - ConvertToRecordProcessor(@NotNull RecordCandidate recordCandidate, boolean showAffectedMembers) { + ConvertToRecordProcessor(@NotNull RecordCandidate recordCandidate) { super(recordCandidate.getProject()); myRecordCandidate = recordCandidate; - myShowAffectedMembers = showAffectedMembers; } @Override @@ -123,9 +121,7 @@ final class ConvertToRecordProcessor extends BaseRefactoringProcessor { usages.add(new RenameMethodUsageInfo(fieldAccessorCandidate.getAccessor(), backingFieldName)); } - if (myShowAffectedMembers) { - usages.addAll(findConflicts(myRecordCandidate)); - } + usages.addAll(findConflicts(myRecordCandidate)); return usages.toArray(UsageInfo.EMPTY_ARRAY); }