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,8 @@
 
 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.NameDeclarationNode;
+import org.sonar.plugins.communitydelphi.api.ast.TypeDeclarationNode;
 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,19 +33,21 @@ 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;
-    // Class/Record/etc. -> VisibilitySection -> Visibility
-    var parent = visibilityNode.getParent().getParent();
-    return IndentationUtils.getLineIndentation(parent);
-  }
-
   @Override
   public DelphiCheckContext visit(VisibilityNode visibilityNode, DelphiCheckContext context) {
-    if (!IndentationUtils.getLineIndentation(visibilityNode)
-        .equals(getExpectedIndentation(visibilityNode))) {
-      reportIssue(context, visibilityNode, MESSAGE);
+    var declaration = visibilityNode.getNthParent(3);
+
+    if (declaration instanceof TypeDeclarationNode) {
+      NameDeclarationNode typeName = ((TypeDeclarationNode) declaration).getTypeNameNode();
+
+      String actual = IndentationUtils.getLineIndentation(visibilityNode);
+      String expected = IndentationUtils.getLineIndentation(typeName);
+
+      if (!actual.equals(expected)) {
+        reportIssue(context, visibilityNode, MESSAGE);
+      }
     }
+
     return super.visit(visibilityNode, context);
   }
 }

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 testRightIndentedVisibilitySpecifierInVarAnonymousRecordShouldNotAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new VisibilityKeywordIndentationCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendDecl("var")
+                .appendDecl("  Foo: record")
+                .appendDecl("    public")
+                .appendDecl("    procedure Proc;")
+                .appendDecl("  end;"))
+        .verifyNoIssues();
+  }
+
+  @Test
+  void testLeftIndentedVisibilitySpecifierInVarAnonymousRecordShouldNotAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new VisibilityKeywordIndentationCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendDecl("var")
+                .appendDecl("  Foo: record")
+                .appendDecl("  public")
+                .appendDecl("    procedure Proc;")
+                .appendDecl("  end;"))
+        .verifyNoIssues();
+  }
+
+  @Test
+  void testRightIndentedVisibilitySpecifierInConstAnonymousRecordShouldNotAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new VisibilityKeywordIndentationCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendDecl("const")
+                .appendDecl("  Foo: record")
+                .appendDecl("    public")
+                .appendDecl("    procedure Proc;")
+                .appendDecl("  end = ();"))
+        .verifyNoIssues();
+  }
+
+  @Test
+  void testLeftIndentedVisibilitySpecifierInConstAnonymousRecordShouldNotAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new VisibilityKeywordIndentationCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendDecl("const")
+                .appendDecl("  Foo: record")
+                .appendDecl("  public")
+                .appendDecl("    procedure Proc;")
+                .appendDecl("  end = ();"))
+        .verifyNoIssues();
+  }
 }