[java-inspections] IDEA-374865 ClassCanBeRecord: fix more edge cases found by Bas

In response to IJ-CR-167896

GitOrigin-RevId: 5c472609a72edc206ac42486fc0f6ecb25ed09b6

java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConstructorBodyProcessor.java

@@ -5,6 +5,7 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.pom.java.JavaFeature;
 import com.intellij.psi.*;
 import com.intellij.psi.controlFlow.ControlFlowUtil;
+import com.intellij.psi.util.InheritanceUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.util.JavaPsiConstructorUtil;
@@ -257,6 +258,11 @@ final class ConstructorBodyProcessor {
         stopWalking();
       }
 
+      @Override
+      public void visitClass(PsiClass aClass) {
+        // Empty on purpose.
+      }
+
       @Override
       public void visitThisExpression(PsiThisExpression expression) {
         super.visitThisExpression(expression);
@@ -266,6 +272,11 @@ final class ConstructorBodyProcessor {
       @Override
       public void visitReferenceExpression(PsiReferenceExpression expression) {
         super.visitReferenceExpression(expression);
+
+        if (expression.getQualifier() != null) {
+          return;
+        }
+
         PsiElement resolved = expression.resolve();
         if (resolved == null) {
           markInvalid();
@@ -273,20 +284,10 @@ final class ConstructorBodyProcessor {
         }
 
         if (resolved instanceof PsiField field && !field.hasModifierProperty(STATIC) && field.getContainingClass() == containingClass) {
-          if (expression.getQualifier() == null) {
-            markInvalid();
-          }
-          else {
-            // There is a qualifier, and it is not "this".
-          }
+          markInvalid();
         }
-        else if (resolved instanceof PsiMethod method) {
-          if (method.hasModifierProperty(STATIC)) return;
-          if (method.getContainingClass() == containingClass) {
-            markInvalid();
-            return;
-          }
-          if (containingClass.findMethodBySignature(method, true) != null) {
+        else if (resolved instanceof PsiMethod method && !method.hasModifierProperty(STATIC)) {
+          if (InheritanceUtil.isInheritorOrSelf(containingClass, method.getContainingClass(), true)) {
             markInvalid();
           }
         }

java/java-tests/testData/inspection/classCanBeRecord/flexibleConstructorBodies/afterDelegating_10.java

@@ -0,0 +1,10 @@
+// "Convert to record class" "true-preview"
+record Person(String name, int age) {
+
+    Person(Person person) {
+        new Object() {{
+            hashCode();
+        }};
+        this(person.name, person.age);
+    }
+}

java/java-tests/testData/inspection/classCanBeRecord/flexibleConstructorBodies/afterDelegating_9.java

@@ -0,0 +1,8 @@
+// "Convert to record class" "true-preview"
+record Person(String name, int age) {
+
+    Person(Person person) {
+        System.out.println(person.hashCode());
+        this(person.name, person.age);
+    }
+}

java/java-tests/testData/inspection/classCanBeRecord/flexibleConstructorBodies/afterDirectFieldAssignments_3.java

@@ -0,0 +1,10 @@
+// "Convert to record class" "true-preview"
+record Person(String name, int age) {
+    Person {
+        System.out.println("".isEmpty());
+    }
+
+    public boolean isEmpty() {
+        return false;
+    }
+}

java/java-tests/testData/inspection/classCanBeRecord/flexibleConstructorBodies/beforeDelegating_10.java

@@ -0,0 +1,17 @@
+// "Convert to record class" "true-preview"
+class Person<caret> {
+    final String name;
+    final int age;
+
+	  Person(String name, int age) {
+		    this.name = name;
+		    this.age = age;
+	  }
+
+    Person(Person person) {
+        new Object() {{
+            hashCode();
+        }};
+        this(person.name, person.age);
+    }
+}

java/java-tests/testData/inspection/classCanBeRecord/flexibleConstructorBodies/beforeDelegating_9.java

@@ -0,0 +1,15 @@
+// "Convert to record class" "true-preview"
+class Person<caret> {
+    final String name;
+    final int age;
+
+    Person(String name, int age) {
+        this.name = name;
+        this.age = age;
+    }
+
+	  Person(Person person) {
+		    System.out.println(person.hashCode());
+		    this(person.name, person.age);
+    }
+}

java/java-tests/testData/inspection/classCanBeRecord/flexibleConstructorBodies/beforeDirectFieldAssignments_3.java

@@ -0,0 +1,15 @@
+// "Convert to record class" "true-preview"
+class Person<caret> {
+    final String name;
+    final int age;
+
+    Person(String name, int age) {
+        System.out.println("".isEmpty());
+        this.name = name;
+        this.age = age;
+    }
+
+    public boolean isEmpty() {
+        return false;
+    }
+}