From cc2b4d4fe389f14b8a13937f4e0d7b2811b57588 Mon Sep 17 00:00:00 2001
From: Ansgar Mertens <ansgar@hashicorp.com>
Date: Tue, 17 Sep 2024 16:22:47 +0200
Subject: [PATCH] fix(hcl): don't parse expressions containing on open curly
 brace as blocks

---
 src/_main.yml                            |  6 +++---
 syntaxes/hcl.tmGrammar.json              |  6 +++---
 syntaxes/terraform.tmGrammar.json        |  3 +++
 tests/snapshot/hcl/block_labels.hcl      |  4 ++++
 tests/snapshot/hcl/block_labels.hcl.snap | 22 ++++++++++++++++++++++
 5 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/_main.yml b/src/_main.yml
index b4ee235..4b9a036 100644
--- a/src/_main.yml
+++ b/src/_main.yml
@@ -76,7 +76,7 @@ repository:
   block:
     name: meta.block.hcl
     comment: This will match HCL blocks like `thing1 "one" "two" {` or `thing2 {`
-    begin: ([\w][\-\w]*)([^?\r\n]*)(\{)
+    begin: ([\w][\-\w]*)(([^\S\r\n]*([\w][\-_\w]*|\"[^\"\r\n]*\"))*)[^\S\r\n]*(\{)
     beginCaptures:
       "1":
         patterns:
@@ -89,9 +89,9 @@ repository:
             comment: Block label (String Literal)
             match: '\"[^\"\r\n]*\"'
           - name: variable.other.enummember.hcl
-            comment: Block label (Indentifier)
+            comment: Block label (Identifier)
             match: "[[:alpha:]][[:alnum:]_-]*"
-      "3":
+      "5":
         name: punctuation.section.block.begin.hcl
     end: \}
     endCaptures:
diff --git a/syntaxes/hcl.tmGrammar.json b/syntaxes/hcl.tmGrammar.json
index d79e516..3bca356 100644
--- a/syntaxes/hcl.tmGrammar.json
+++ b/syntaxes/hcl.tmGrammar.json
@@ -82,7 +82,7 @@
     },
     "block": {
       "name": "meta.block.hcl",
-      "begin": "([\\w][\\-\\w]*)([^?\\r\\n]*)(\\{)",
+      "begin": "([\\w][\\-\\w]*)(([^\\S\\r\\n]*([\\w][\\-_\\w]*|\\\"[^\\\"\\r\\n]*\\\"))*)[^\\S\\r\\n]*(\\{)",
       "end": "\\}",
       "comment": "This will match HCL blocks like `thing1 \"one\" \"two\" {` or `thing2 {`",
       "beginCaptures": {
@@ -104,12 +104,12 @@
             },
             {
               "match": "[[:alpha:]][[:alnum:]_-]*",
-              "comment": "Block label (Indentifier)",
+              "comment": "Block label (Identifier)",
               "name": "variable.other.enummember.hcl"
             }
           ]
         },
-        "3": {
+        "5": {
           "name": "punctuation.section.block.begin.hcl"
         }
       },
diff --git a/syntaxes/terraform.tmGrammar.json b/syntaxes/terraform.tmGrammar.json
index c37aedd..aa9ffb7 100644
--- a/syntaxes/terraform.tmGrammar.json
+++ b/syntaxes/terraform.tmGrammar.json
@@ -112,6 +112,9 @@
         },
         "3": {
           "name": "punctuation.section.block.begin.hcl"
+        },
+        "5": {
+          "name": "punctuation.section.block.begin.hcl"
         }
       },
       "endCaptures": {
diff --git a/tests/snapshot/hcl/block_labels.hcl b/tests/snapshot/hcl/block_labels.hcl
index ec80564..f73333f 100644
--- a/tests/snapshot/hcl/block_labels.hcl
+++ b/tests/snapshot/hcl/block_labels.hcl
@@ -49,6 +49,10 @@ block-single-char-indentifier-newline a {
 byte_match_statement_rules = local.enabled && var.byte_match_statement_rules != null ? {
 }
 
+# braces are fun (now)
+a = not_a_block == "{"
+brace_label "{" {}
+
 path "secrets/data/users/{{identity.entity.name}}/*" {
   capabilities = ["create", "update", "patch", "read", "delete", "list"]
 }
diff --git a/tests/snapshot/hcl/block_labels.hcl.snap b/tests/snapshot/hcl/block_labels.hcl.snap
index 4b55483..daa6dc2 100644
--- a/tests/snapshot/hcl/block_labels.hcl.snap
+++ b/tests/snapshot/hcl/block_labels.hcl.snap
@@ -266,6 +266,28 @@
 >}
 #^ source.hcl meta.braces.hcl punctuation.section.braces.end.hcl
 >
+># braces are fun (now)
+#^ source.hcl comment.line.number-sign.hcl punctuation.definition.comment.hcl
+# ^^^^^^^^^^^^^^^^^^^^^ source.hcl comment.line.number-sign.hcl
+>a = not_a_block == "{"
+#^ source.hcl variable.declaration.hcl variable.other.readwrite.hcl
+# ^ source.hcl variable.declaration.hcl
+#  ^ source.hcl variable.declaration.hcl keyword.operator.assignment.hcl
+#   ^ source.hcl variable.declaration.hcl
+#    ^^^^^^^^^^^^ source.hcl
+#                ^^ source.hcl keyword.operator.hcl
+#                  ^ source.hcl
+#                   ^ source.hcl string.quoted.double.hcl punctuation.definition.string.begin.hcl
+#                    ^ source.hcl string.quoted.double.hcl
+#                     ^ source.hcl string.quoted.double.hcl punctuation.definition.string.end.hcl
+>brace_label "{" {}
+#^^^^^^^^^^^ source.hcl meta.block.hcl entity.name.type.hcl
+#           ^ source.hcl meta.block.hcl
+#            ^^^ source.hcl meta.block.hcl variable.other.enummember.hcl
+#               ^ source.hcl meta.block.hcl
+#                ^ source.hcl meta.block.hcl punctuation.section.block.begin.hcl
+#                 ^ source.hcl meta.block.hcl punctuation.section.block.end.hcl
+>
 >path "secrets/data/users/{{identity.entity.name}}/*" {
 #^^^^ source.hcl meta.block.hcl entity.name.type.hcl
 #    ^ source.hcl meta.block.hcl