From 70da0861d7e3e3f478d19850cad2d575a32cd3bd Mon Sep 17 00:00:00 2001 From: Bartek Pacia Date: Tue, 8 Jul 2025 16:24:13 +0200 Subject: [PATCH] [java-inspections] ClassCanBeRecord: reformat code, optimize imports, and fix a typo GitOrigin-RevId: 62692165487b1166ea671a66d9d1ff5ade8da980 --- .../classCanBeRecord/ClassCanBeRecordInspection.java | 3 ++- .../classCanBeRecord/ConstructorBodyProcessor.java | 2 +- .../codeInspection/classCanBeRecord/ConvertToRecordFix.java | 5 ++++- .../codeInspection/classCanBeRecord/EqualsChecker.java | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) 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 fd4072cb4ce0..526714e26125 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 @@ -32,6 +32,7 @@ import java.util.Set; import static com.intellij.codeInspection.ProblemHighlightType.GENERIC_ERROR_OR_WARNING; import static com.intellij.codeInspection.ProblemHighlightType.INFORMATION; import static com.intellij.codeInspection.classCanBeRecord.ClassCanBeRecordInspection.ConversionStrategy.*; +import static com.intellij.codeInspection.classCanBeRecord.ConvertToRecordFix.*; import static com.intellij.codeInspection.options.OptPane.*; public final class ClassCanBeRecordInspection extends BaseInspection implements CleanupLocalInspectionTool { @@ -136,7 +137,7 @@ public final class ClassCanBeRecordInspection extends BaseInspection implements super.visitClass(aClass); PsiIdentifier classIdentifier = aClass.getNameIdentifier(); if (classIdentifier == null) return; - RecordCandidate recordCandidate = ConvertToRecordFix.tryCreateRecordCandidate(aClass, mySuggestAccessorsRenaming, myIgnoredAnnotations); + RecordCandidate recordCandidate = tryCreateRecordCandidate(aClass, mySuggestAccessorsRenaming, myIgnoredAnnotations); if (recordCandidate == null) return; boolean suggestQuickFix = true; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConstructorBodyProcessor.java b/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConstructorBodyProcessor.java index 71484c1bc58e..72a9b9168b05 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConstructorBodyProcessor.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConstructorBodyProcessor.java @@ -77,7 +77,7 @@ final class ConstructorBodyProcessor { // This means that: // - all instance variables must be already initialized, OR // - (JDK 25+) this statement is inside early construction context, more specifically: in constructor prologue (see JEP 513). - // This means that it must NOT use use 'this', either implicitly or explicitly, except for simple assignment statements. + // This means that it must NOT use 'this', either implicitly or explicitly, except for simple assignment statements. otherStatements.add(statement); if (fieldNamesToInitializers.isEmpty() && PsiUtil.isAvailable(JavaFeature.STATEMENTS_BEFORE_SUPER, statement)) { 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 23e59c729ef4..2e31a8fbb5c5 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 @@ -16,7 +16,10 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.PsiAnnotation.TargetType; import com.intellij.psi.search.searches.ClassInheritorsSearch; -import com.intellij.psi.util.*; +import com.intellij.psi.util.JavaPsiRecordUtil; +import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; +import com.intellij.psi.util.PsiUtil; import com.intellij.usageView.UsageInfo; import com.intellij.util.ObjectUtils; import com.intellij.util.SmartList; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/EqualsChecker.java b/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/EqualsChecker.java index e2baa3709ea6..6699eec07acf 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/EqualsChecker.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/EqualsChecker.java @@ -71,7 +71,7 @@ final class EqualsChecker { } /** - * Matches {@code Objects.equals(this.x, that.x)} or {@code this.x == that.x} or + * Matches {@code Objects.equals(this.x, that.x)} or {@code this.x == that.x} or * {@code Double.doubleToLongBits(this.x) == Double.doubleToLongBits(that.x)} * and returns the field x; null if not matched */