Disambiguate const array literals from parenthesized primary expressions

Author: cirras

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Non-trivial `inherited` expressions are excluded in `RedundantParentheses`.
 
+### Fixed
+
+- False positives around const array literals in `RedundantParentheses`.
+
 ## [1.9.0] - 2024-09-03
 
 ### Added

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

@@ -89,7 +89,7 @@ void testParenthesesOnUnaryExpressionShouldNotAddIssue() {
   }
 
   @Test
-  void testParenthesesOnNonTrivialInheritedExpressionShouldAddIssue() {
+  void testParenthesesOnNonTrivialInheritedExpressionShouldNotAddIssue() {
     CheckVerifier.newVerifier()
         .withCheck(new RedundantParenthesesCheck())
         .onFile(
@@ -101,6 +101,41 @@ void testParenthesesOnNonTrivialInheritedExpressionShouldAddIssue() {
         .verifyNoIssues();
   }
 
+  @Test
+  void testSingleElementConstArrayLiteralShouldNotAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new RedundantParenthesesCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendImpl("const")
+                .appendImpl("  CArray: array[0..0] of Integer = (123);"))
+        .verifyNoIssues();
+  }
+
+  @Test
+  void testSingleElementVarArrayLiteralShouldNotAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new RedundantParenthesesCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendImpl("var")
+                .appendImpl("  A: array[0..0] of Integer = (123);"))
+        .verifyNoIssues();
+  }
+
+  @Test
+  void testParenthesesOnPrimaryExpressionWithinSingleElementArrayLiteralShouldAddIssue() {
+    CheckVerifier.newVerifier()
+        .withCheck(new RedundantParenthesesCheck())
+        .onFile(
+            new DelphiTestUnitBuilder()
+                .appendImpl("var")
+                .appendImpl("  // Fix@[+2:31 to +2:32] <<>>")
+                .appendImpl("  // Fix@[+1:35 to +1:36] <<>>")
+                .appendImpl("  A: array[0..0] of Integer = ((123)); // Noncompliant"))
+        .verifyIssues();
+  }
+
   @Test
   void testParenthesesOnParenthesizedExpressionShouldAddIssue() {
     CheckVerifier.newVerifier()

delphi-frontend/src/main/antlr3/au/com/integradev/delphi/antlr/Delphi.g

@@ -467,7 +467,9 @@ constSection                 : (CONST<ConstSectionNodeImpl>^ | RESOURCESTRING<Co
                              // example: "const {$include versioninfo.inc}"
                              // Is this really the appropriate solution?
                              ;
-constDeclaration             : attributeList? nameDeclaration (':' varType)? '=' constExpression portabilityDirective* ';'
+constDeclaration             : attributeList? nameDeclaration ':' fixedArrayType '=' arrayExpression portabilityDirective* ';'
+                             -> ^(TkConstDeclaration<ConstDeclarationNodeImpl> nameDeclaration arrayExpression fixedArrayType attributeList? portabilityDirective*)
+                             | attributeList? nameDeclaration (':' varType)? '=' constExpression portabilityDirective* ';'
                              -> ^(TkConstDeclaration<ConstDeclarationNodeImpl> nameDeclaration constExpression varType? attributeList? portabilityDirective*)
                              ;
 typeSection                  : TYPE<TypeSectionNodeImpl>^ typeDeclaration+
@@ -479,9 +481,14 @@ typeDeclaration              : attributeList? genericNameDeclaration '=' typeDec
                              ;
 varSection                   : (VAR<VarSectionNodeImpl>^ | THREADVAR<VarSectionNodeImpl>^) varDeclaration varDeclaration*
                              ;
-varDeclaration               : attributeList? nameDeclarationList ':' varType portabilityDirective* varValueSpec? portabilityDirective* ';'
+varDeclaration               : attributeList? nameDeclarationList ':' fixedArrayType portabilityDirective* arrayVarValueSpec? portabilityDirective* ';'
+                             -> ^(TkVarDeclaration<VarDeclarationNodeImpl> nameDeclarationList fixedArrayType arrayVarValueSpec? attributeList?)
+                             | attributeList? nameDeclarationList ':' varType portabilityDirective* varValueSpec? portabilityDirective* ';'
                              -> ^(TkVarDeclaration<VarDeclarationNodeImpl> nameDeclarationList varType varValueSpec? attributeList?)
                              ;
+arrayVarValueSpec            : ABSOLUTE expression
+                             | '=' arrayExpression
+                             ;
 varValueSpec                 : ABSOLUTE expression
                              | '=' constExpression
                              ;
@@ -531,6 +538,9 @@ parameterType                : stringType
                              | typeReference
                              | PACKED parameterType^
                              ;
+fixedArrayType               : ARRAY arrayIndices OF arrayElementType
+                             -> ^(ARRAY<ArrayTypeNodeImpl> OF arrayElementType arrayIndices )
+                             ;
 arrayType                    :  ARRAY arrayIndices? OF arrayElementType
                              -> ^(ARRAY<ArrayTypeNodeImpl> OF arrayElementType arrayIndices? )
                              ;