Fix FPs on wrapped type headers in VisibilityKeywordIndentation

Author: cirras

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- False positives around wrapped type declarations in `VisibilityKeywordIndentation`.
+
 ## [1.14.1] - 2025-03-05
 
 ### Fixed

delphi-checks/src/main/java/au/com/integradev/delphi/checks/VisibilityKeywordIndentationCheck.java

@@ -20,7 +20,9 @@
 
 import au.com.integradev.delphi.utils.IndentationUtils;
 import org.sonar.check.Rule;
-import org.sonar.plugins.communitydelphi.api.ast.DelphiNode;
+import org.sonar.plugins.communitydelphi.api.ast.ConstDeclarationNode;
+import org.sonar.plugins.communitydelphi.api.ast.TypeDeclarationNode;
+import org.sonar.plugins.communitydelphi.api.ast.VarDeclarationNode;
 import org.sonar.plugins.communitydelphi.api.ast.VisibilityNode;
 import org.sonar.plugins.communitydelphi.api.check.DelphiCheck;
 import org.sonar.plugins.communitydelphi.api.check.DelphiCheckContext;
@@ -32,11 +34,20 @@ public class VisibilityKeywordIndentationCheck extends DelphiCheck {
   private static final String MESSAGE =
       "Indent this visibility specifier to the indentation level of the containing type.";
 
-  private static String getExpectedIndentation(DelphiNode node) {
-    var visibilityNode = (VisibilityNode) node;
+  private static String getExpectedIndentation(VisibilityNode node) {
     // Class/Record/etc. -> VisibilitySection -> Visibility
-    var parent = visibilityNode.getParent().getParent();
-    return IndentationUtils.getLineIndentation(parent);
+    var anchor = node.getParent().getParent();
+
+    var declaration = anchor.getParent();
+    if (declaration instanceof TypeDeclarationNode) {
+      anchor = ((TypeDeclarationNode) declaration).getTypeNameNode();
+    } else if (declaration instanceof VarDeclarationNode) {
+      anchor = ((VarDeclarationNode) declaration).getNameDeclarationList();
+    } else if (declaration instanceof ConstDeclarationNode) {
+      anchor = ((ConstDeclarationNode) declaration).getNameDeclarationNode();
+    }
+
+    return IndentationUtils.getLineIndentation(anchor);
   }
 
   @Override

delphi-checks/src/test/java/au/com/integradev/delphi/checks/VisibilityKeywordIndentationCheckTest.java

@@ -96,4 +96,104 @@ void testUnindentedVisibilitySpecifierShouldAddIssue() {
                 .appendDecl("  end;"))
         .verifyIssues();
   }
+
+  @Test
+  void testIndentedVisibilitySpecifierWithWrappedClassDeclarationShouldNotAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new VisibilityKeywordIndentationCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendDecl("type")
+                .appendDecl("  TFoo =")
+                .appendDecl("    class(TObject)")
+                .appendDecl("  private")
+                .appendDecl("    procedure Proc;")
+                .appendDecl("  end;"))
+        .verifyNoIssues();
+  }
+
+  @Test
+  void testIndentedVisibilitySpecifierWithMisalignedCustomAttributeShouldNotAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new VisibilityKeywordIndentationCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendDecl("type")
+                .appendDecl("    [Foo]")
+                .appendDecl("  TBar = class(TObject)")
+                .appendDecl("  private")
+                .appendDecl("    procedure Baz;")
+                .appendDecl("  end;"))
+        .verifyNoIssues();
+  }
+
+  @Test
+  void testIndentedVisibilitySpecifierWithSameLineCustomAttributeShouldNotAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new VisibilityKeywordIndentationCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendDecl("type")
+                .appendDecl("  [Foo] TBar = class(TObject)")
+                .appendDecl("  private")
+                .appendDecl("    procedure Baz;")
+                .appendDecl("  end;"))
+        .verifyNoIssues();
+  }
+
+  @Test
+  void testTooIndentedVisibilitySpecifierInVarAnonymousRecordShouldAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new VisibilityKeywordIndentationCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendDecl("var")
+                .appendDecl("  Foo: record")
+                .appendDecl("    public // Noncompliant")
+                .appendDecl("    procedure Proc;")
+                .appendDecl("  end;"))
+        .verifyIssues();
+  }
+
+  @Test
+  void testCorrectlyIndentedVisibilitySpecifierInVarAnonymousRecordShouldNotAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new VisibilityKeywordIndentationCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendDecl("var")
+                .appendDecl("  Foo: record")
+                .appendDecl("  public")
+                .appendDecl("    procedure Proc;")
+                .appendDecl("  end;"))
+        .verifyNoIssues();
+  }
+
+  @Test
+  void testTooIndentedVisibilitySpecifierInConstAnonymousRecordShouldAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new VisibilityKeywordIndentationCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendDecl("const")
+                .appendDecl("  Foo: record")
+                .appendDecl("    public // Noncompliant")
+                .appendDecl("    procedure Proc;")
+                .appendDecl("  end = ();"))
+        .verifyIssues();
+  }
+
+  @Test
+  void testCorrectlyIndentedVisibilitySpecifierInConstAnonymousRecordShouldNotAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new VisibilityKeywordIndentationCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendDecl("const")
+                .appendDecl("  Foo: record")
+                .appendDecl("  public")
+                .appendDecl("    procedure Proc;")
+                .appendDecl("  end = ();"))
+        .verifyNoIssues();
+  }
 }