Variables with no space between them break syntax highlighting (#34)

* Replace the anchor with negative lookbehind

* Add an example of two variables without whitespace between them to the test

* Update remaining HCL snapshots

src/_main.yml

@@ -148,11 +148,11 @@ repository:
       - include: "#string_interpolation"
       - include: "#char_escapes"
   string_interpolation:
-    begin: (\G|[^%$])([%$]{)
+    begin: '(?<![%$])([%$]{)'
     comment: String interpolation
     name: meta.interpolation.hcl
     beginCaptures:
-      "2":
+      "1":
         name: keyword.other.interpolation.begin.hcl
     end: \}
     endCaptures:

syntaxes/hcl.tmGrammar.json

@@ -677,11 +677,11 @@
     },
     "string_interpolation": {
       "name": "meta.interpolation.hcl",
-      "begin": "(\\G|[^%$])([%$]{)",
+      "begin": "(?<![%$])([%$]{)",
       "end": "\\}",
       "comment": "String interpolation",
       "beginCaptures": {
-        "2": {
+        "1": {
           "name": "keyword.other.interpolation.begin.hcl"
         }
       },

syntaxes/terraform.tmGrammar.json

@@ -701,11 +701,11 @@
     },
     "string_interpolation": {
       "name": "meta.interpolation.hcl",
-      "begin": "(\\G|[^%$])([%$]{)",
+      "begin": "(?<![%$])([%$]{)",
       "end": "\\}",
       "comment": "String interpolation",
       "beginCaptures": {
-        "2": {
+        "1": {
           "name": "keyword.other.interpolation.begin.hcl"
         }
       },

tests/snapshot/hcl/basic.hcl.snap

@@ -112,8 +112,7 @@
 #        ^ source.hcl variable.declaration.hcl keyword.operator.assignment.hcl
 #         ^ source.hcl variable.declaration.hcl
 #          ^ source.hcl string.quoted.double.hcl punctuation.definition.string.begin.hcl
-#           ^^^^^^ source.hcl string.quoted.double.hcl
-#                 ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl
+#           ^^^^^^^ source.hcl string.quoted.double.hcl
 #                  ^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #                    ^^^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl variable.other.readwrite.hcl
 #                        ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl

tests/snapshot/hcl/expressions_for.hcl.snap

@@ -69,8 +69,7 @@
 #                         ^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #                           ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl variable.other.readwrite.hcl
 #                            ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
-#                             ^^^ source.hcl string.quoted.double.hcl
-#                                ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl
+#                             ^^^^ source.hcl string.quoted.double.hcl
 #                                 ^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #                                   ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl variable.other.readwrite.hcl
 #                                    ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl

tests/snapshot/hcl/expressions_functions.hcl.snap

@@ -161,8 +161,7 @@
 #                                                                            ^ source.hcl meta.function-call.hcl punctuation.section.parens.end.hcl
 >"  items: ${indent(2, "[\n  foo,\n  bar,\n]\n")}"
 #^ source.hcl string.quoted.double.hcl punctuation.definition.string.begin.hcl
-# ^^^^^^^^ source.hcl string.quoted.double.hcl
-#         ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl
+# ^^^^^^^^^ source.hcl string.quoted.double.hcl
 #          ^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #            ^^^^^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl meta.function-call.hcl support.function.builtin.hcl
 #                  ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl meta.function-call.hcl punctuation.section.parens.begin.hcl

tests/snapshot/hcl/expressions_strings.hcl.snap

@@ -80,8 +80,7 @@
 >
 >"Hello, ${var.name}!"
 #^ source.hcl string.quoted.double.hcl punctuation.definition.string.begin.hcl
-# ^^^^^^ source.hcl string.quoted.double.hcl
-#       ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl
+# ^^^^^^^ source.hcl string.quoted.double.hcl
 #        ^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #          ^^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl variable.other.readwrite.hcl
 #             ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.operator.accessor.hcl
@@ -92,8 +91,7 @@
 >
 >"Hello, %{ if var.name != "" }${var.name}%{ else }unnamed%{ endif }!"
 #^ source.hcl string.quoted.double.hcl punctuation.definition.string.begin.hcl
-# ^^^^^^ source.hcl string.quoted.double.hcl
-#       ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl
+# ^^^^^^^ source.hcl string.quoted.double.hcl
 #        ^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #          ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl
 #           ^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.control.hcl
@@ -108,15 +106,17 @@
 #                           ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl string.quoted.double.hcl punctuation.definition.string.end.hcl
 #                            ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl
 #                             ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
-#                              ^^^^^^^^^^ source.hcl string.quoted.double.hcl
-#                                        ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl
+#                              ^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
+#                                ^^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl variable.other.readwrite.hcl
+#                                   ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.operator.accessor.hcl
+#                                    ^^^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl variable.other.member.hcl
+#                                        ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
 #                                         ^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #                                           ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl
 #                                            ^^^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.control.hcl
 #                                                ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl
 #                                                 ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
-#                                                  ^^^^^^ source.hcl string.quoted.double.hcl
-#                                                        ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl
+#                                                  ^^^^^^^ source.hcl string.quoted.double.hcl
 #                                                         ^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #                                                           ^ source.hcl string.quoted.double.hcl meta.interpolation.hcl
 #                                                            ^^^^^ source.hcl string.quoted.double.hcl meta.interpolation.hcl keyword.control.hcl
@@ -146,8 +146,7 @@
 #                                              ^ source.hcl string.unquoted.heredoc.hcl meta.interpolation.hcl
 #                                               ^ source.hcl string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
 >server ${ip}
-#^^^^^^ source.hcl string.unquoted.heredoc.hcl
-#      ^ source.hcl string.unquoted.heredoc.hcl meta.interpolation.hcl
+#^^^^^^^ source.hcl string.unquoted.heredoc.hcl
 #       ^^ source.hcl string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #         ^^ source.hcl string.unquoted.heredoc.hcl meta.interpolation.hcl variable.other.readwrite.hcl
 #           ^ source.hcl string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
@@ -181,8 +180,7 @@
 #                                              ^^ source.hcl string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.operator.template.right.trim.hcl
 #                                                ^ source.hcl string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
 >server ${ip}
-#^^^^^^ source.hcl string.unquoted.heredoc.hcl
-#      ^ source.hcl string.unquoted.heredoc.hcl meta.interpolation.hcl
+#^^^^^^^ source.hcl string.unquoted.heredoc.hcl
 #       ^^ source.hcl string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #         ^^ source.hcl string.unquoted.heredoc.hcl meta.interpolation.hcl variable.other.readwrite.hcl
 #           ^ source.hcl string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl

tests/snapshot/terraform/expressions_for.tf.snap

@@ -69,8 +69,7 @@
 #                         ^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #                           ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl variable.other.readwrite.hcl
 #                            ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
-#                             ^^^ source.hcl.terraform string.quoted.double.hcl
-#                                ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl
+#                             ^^^^ source.hcl.terraform string.quoted.double.hcl
 #                                 ^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #                                   ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl variable.other.readwrite.hcl
 #                                    ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl

tests/snapshot/terraform/expressions_functions.tf.snap

@@ -161,8 +161,7 @@
 #                                                                            ^ source.hcl.terraform meta.function-call.hcl punctuation.section.parens.end.hcl
 >"  items: ${indent(2, "[\n  foo,\n  bar,\n]\n")}"
 #^ source.hcl.terraform string.quoted.double.hcl punctuation.definition.string.begin.hcl
-# ^^^^^^^^ source.hcl.terraform string.quoted.double.hcl
-#         ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl
+# ^^^^^^^^^ source.hcl.terraform string.quoted.double.hcl
 #          ^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #            ^^^^^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl meta.function-call.hcl support.function.builtin.terraform
 #                  ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl meta.function-call.hcl punctuation.section.parens.begin.hcl

tests/snapshot/terraform/expressions_strings.tf

@@ -25,7 +25,7 @@ block {
   EOT
 }
 
-"Hello, ${var.name}!"
+"Hello, ${var.name}${var.name}!"
 
 "Hello, %{ if var.name != "" }${var.name}%{ else }unnamed%{ endif }!"
 

tests/snapshot/terraform/expressions_strings.tf.snap

@@ -78,22 +78,25 @@
 >}
 #^ source.hcl.terraform meta.block.hcl punctuation.section.block.end.hcl
 >
->"Hello, ${var.name}!"
+>"Hello, ${var.name}${var.name}!"
 #^ source.hcl.terraform string.quoted.double.hcl punctuation.definition.string.begin.hcl
-# ^^^^^^ source.hcl.terraform string.quoted.double.hcl
-#       ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl
+# ^^^^^^^ source.hcl.terraform string.quoted.double.hcl
 #        ^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #          ^^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl variable.other.readwrite.terraform
 #             ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.operator.accessor.hcl
 #              ^^^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl variable.other.member.hcl
 #                  ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
-#                   ^ source.hcl.terraform string.quoted.double.hcl
-#                    ^ source.hcl.terraform string.quoted.double.hcl punctuation.definition.string.end.hcl
+#                   ^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
+#                     ^^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl variable.other.readwrite.terraform
+#                        ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.operator.accessor.hcl
+#                         ^^^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl variable.other.member.hcl
+#                             ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
+#                              ^ source.hcl.terraform string.quoted.double.hcl
+#                               ^ source.hcl.terraform string.quoted.double.hcl punctuation.definition.string.end.hcl
 >
 >"Hello, %{ if var.name != "" }${var.name}%{ else }unnamed%{ endif }!"
 #^ source.hcl.terraform string.quoted.double.hcl punctuation.definition.string.begin.hcl
-# ^^^^^^ source.hcl.terraform string.quoted.double.hcl
-#       ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl
+# ^^^^^^^ source.hcl.terraform string.quoted.double.hcl
 #        ^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #          ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl
 #           ^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.control.hcl
@@ -108,15 +111,17 @@
 #                           ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl string.quoted.double.hcl punctuation.definition.string.end.hcl
 #                            ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl
 #                             ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
-#                              ^^^^^^^^^^ source.hcl.terraform string.quoted.double.hcl
-#                                        ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl
+#                              ^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
+#                                ^^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl variable.other.readwrite.terraform
+#                                   ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.operator.accessor.hcl
+#                                    ^^^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl variable.other.member.hcl
+#                                        ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
 #                                         ^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #                                           ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl
 #                                            ^^^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.control.hcl
 #                                                ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl
 #                                                 ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
-#                                                  ^^^^^^ source.hcl.terraform string.quoted.double.hcl
-#                                                        ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl
+#                                                  ^^^^^^^ source.hcl.terraform string.quoted.double.hcl
 #                                                         ^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #                                                           ^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl
 #                                                            ^^^^^ source.hcl.terraform string.quoted.double.hcl meta.interpolation.hcl keyword.control.hcl
@@ -146,8 +151,7 @@
 #                                              ^ source.hcl.terraform string.unquoted.heredoc.hcl meta.interpolation.hcl
 #                                               ^ source.hcl.terraform string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
 >server ${ip}
-#^^^^^^ source.hcl.terraform string.unquoted.heredoc.hcl
-#      ^ source.hcl.terraform string.unquoted.heredoc.hcl meta.interpolation.hcl
+#^^^^^^^ source.hcl.terraform string.unquoted.heredoc.hcl
 #       ^^ source.hcl.terraform string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #         ^^ source.hcl.terraform string.unquoted.heredoc.hcl meta.interpolation.hcl variable.other.readwrite.hcl
 #           ^ source.hcl.terraform string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
@@ -181,8 +185,7 @@
 #                                              ^^ source.hcl.terraform string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.operator.template.right.trim.hcl
 #                                                ^ source.hcl.terraform string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl
 >server ${ip}
-#^^^^^^ source.hcl.terraform string.unquoted.heredoc.hcl
-#      ^ source.hcl.terraform string.unquoted.heredoc.hcl meta.interpolation.hcl
+#^^^^^^^ source.hcl.terraform string.unquoted.heredoc.hcl
 #       ^^ source.hcl.terraform string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.other.interpolation.begin.hcl
 #         ^^ source.hcl.terraform string.unquoted.heredoc.hcl meta.interpolation.hcl variable.other.readwrite.hcl
 #           ^ source.hcl.terraform string.unquoted.heredoc.hcl meta.interpolation.hcl keyword.other.interpolation.end.hcl