SONARJAVA-5116 S1105 sometimes falsely requests the curly brace to be…

… moved (#4874)

java-checks-test-sources/default/src/main/java/checks/LeftCurlyBraceEndLineCheck_record.java

@@ -0,0 +1,37 @@
+package checks;
+
+record LeftCurlyBraceEndLineCheck_record(Integer value) {
+
+  // Test https://sonarsource.atlassian.net/browse/SONARJAVA-5116
+  public LeftCurlyBraceEndLineCheck_record(String v) { // Compliant
+    // but <- Complains about this curly brace
+    this(Integer.parseInt(v));
+  }
+
+  public static final String FOR_SOME_REASON_THIS_NEEDS_TO_EXIST_HERE_TO_REPRODUCE_ISSUE = "IDK";
+  public static final String FOR_SOME_REASON_THIS_NEEDS_TO_EXIST_HERE_TO_REPRODUCE_ISSUE_2 = "IDK";
+
+}
+
+record TestRecordSyntaxV2(String value) {
+
+  // Test https://sonarsource.atlassian.net/browse/SONARJAVA-5116
+  private void doThing() { // Compliant
+    // but <- Complains about this curly brace
+    new LeftCurlyBraceEndLineCheck_record("brace");
+  }
+
+  public record ThisRecordCausesTheIssueAsWell(String value) {
+  }
+
+}
+
+record TestRecordSyntaxV3(Integer value)
+{ // Noncompliant
+  public TestRecordSyntaxV3(String v)
+  { // Noncompliant
+    this(Integer.parseInt(v));
+  }
+  public static final String CONST_1 = "IDK";
+  public static final String CONST_2 = "IDK";
+}

java-checks/src/test/java/org/sonar/java/checks/LeftCurlyBraceEndLineCheckTest.java

@@ -41,6 +41,14 @@ void java_17() {
       .verifyIssues();
   }
 
+  @Test
+  void test_record() {
+    CheckVerifier.newVerifier()
+      .onFile(TestUtils.mainCodeSourcesPath("checks/LeftCurlyBraceEndLineCheck_record.java"))
+      .withCheck(new LeftCurlyBraceEndLineCheck())
+      .verifyIssues();
+  }
+
   @Test
   void detected_switch_expressions() {
     CheckVerifier.newVerifier()

java-frontend/src/main/java/org/sonar/java/model/JParser.java

@@ -827,7 +827,16 @@ private int findLeftBraceTokenIndex(AbstractTypeDeclaration e) {
       return tokenManager.lastIndexIn(e, TerminalTokens.TokenNameLBRACE);
     }
     if (!e.bodyDeclarations().isEmpty()) {
-      return tokenManager.firstIndexBefore((ASTNode) e.bodyDeclarations().get(0), TerminalTokens.TokenNameLBRACE);
+      // for records, bodyDeclarations may not be in the order encountered in file, for classes they are
+      List<BodyDeclaration> bodyDeclarations = e.bodyDeclarations();
+      BodyDeclaration firstDeclaration = bodyDeclarations.get(0);
+      for (int i = 1; i < bodyDeclarations.size(); i++) {
+        BodyDeclaration declaration = bodyDeclarations.get(i);
+        if (firstDeclaration.getStartPosition() > declaration.getStartPosition()) {
+          firstDeclaration = declaration;
+        }
+      }
+      return tokenManager.firstIndexBefore(firstDeclaration, TerminalTokens.TokenNameLBRACE);
     }
     return tokenManager.lastIndexIn(e, TerminalTokens.TokenNameLBRACE);
   }