Merge pull request #119 from amplify-education/feature/comments-inside-the-list-or-function-args

Add feature to parse comments in function args and list elems.

Author: htorianik

hcl2/hcl2.lark

@@ -46,15 +46,15 @@ int_lit : DECIMAL+
 DECIMAL : "0".."9"
 EXP_MARK : ("e" | "E") ("+" | "-")?
 
-tuple : "[" (new_line_or_comment? expression (new_line_or_comment? "," new_line_or_comment? expression)* new_line_or_comment? ","?)? new_line_or_comment? "]"
+tuple : "[" (new_line_or_comment* expression new_line_or_comment* ",")* (new_line_or_comment* expression)? new_line_or_comment* "]"
 object : "{" new_line_or_comment? (object_elem (new_line_and_or_comma object_elem )* new_line_and_or_comma?)? "}"
 object_elem : (identifier | expression) ("=" | ":") expression
 
 heredoc_template : /<<(?P<heredoc>[a-zA-Z][a-zA-Z0-9._-]+)\n(?:.|\n)*?(?P=heredoc)/
 heredoc_template_trim : /<<-(?P<heredoc_trim>[a-zA-Z][a-zA-Z0-9._-]+)\n(?:.|\n)*?(?P=heredoc_trim)/
 
 function_call : identifier "(" new_line_or_comment? arguments? new_line_or_comment? ")"
-arguments : (expression (new_line_or_comment? "," new_line_or_comment?  expression)* ("," | "...")? new_line_or_comment?)
+arguments : (expression (new_line_or_comment* "," new_line_or_comment*  expression)* ("," | "...")? new_line_or_comment*)
 
 index_expr_term : expr_term index
 get_attr_expr_term : expr_term get_attr

test/helpers/terraform-config-json/multiline_expressions.json

@@ -27,6 +27,30 @@
           "triggers": []
         }
       }
+    },
+    {
+      "null_resource": {
+        "multiline_comment_multiple_single_element": {
+          "triggers": [
+            2
+          ]
+        }
+      }
+    }
+  ],
+  "variable": [
+    {
+      "some_var2": {
+        "description": "description",
+        "type": "${string}",
+        "default": "${cidrsubnets(\"10.0.0.0/24\", 2, 2)}"
+      }
+    },
+    {
+      "some_var2": {
+        "description": "description",
+        "default": "${concat([{'1': '1'}], [{'2': '2'}])}"
+      }
     }
   ]
 }

test/helpers/terraform-config/multiline_expressions.tf

@@ -20,3 +20,41 @@ resource "null_resource" "multiline_comment_single_line_after_opening_bracket" {
     triggers = [ /* "a", "b" */
     ]
 }
+
+resource "null_resource" "multiline_comment_multiple_single_element" {
+    triggers = [ /* "a",
+        "b" */
+        2,
+        # "c"
+    ]
+}
+
+variable "some_var2" {
+  description = "description"
+  type        = string
+  default     = cidrsubnets(
+    # comment 1
+    # comment 2
+    "10.0.0.0/24",
+    # comment 3
+    # comment 4
+    2,
+    # comment 5
+    # comment 6
+    2
+    # comment 7
+    # comment 8
+  )
+}
+
+variable "some_var2" {
+  description = "description"
+  default = concat(
+    # comment 1
+    [{"1": "1"} /* comment 2 */ ],
+    # comment 3
+    # comment 4
+    [{"2": "2"},]
+    # comment 5
+  )
+}