Skip to content

Commit b9d4247

Browse files
committed
Fix string object key assignment
1 parent e51615d commit b9d4247

File tree

4 files changed

+55
-2
lines changed

4 files changed

+55
-2
lines changed

src/_main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ repository:
271271
name: meta.mapping.key.hcl variable.other.readwrite.hcl
272272
"2":
273273
name: keyword.operator.assignment.hcl
274-
- match: \b((").*("))\s*(\=)\s*
274+
- match: ^\s*((").*("))\s*(\=)\s*
275275
comment: String object key
276276
captures:
277277
"1":

syntaxes/hcl.tmGrammar.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/snapshot/hcl/issue79.hcl

+2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@ block {
44
nested_obj = {
55
attr = var.test
66
attr2 = var.test == "foo" ? "true" : "false"
7+
"attr2" = var.test == "foo" ? "true" : "false"
8+
(attr2) = var.test == "foo" ? "true" : "false"
79
}
810
}

tests/snapshot/hcl/issue79.hcl.snap

+51
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,57 @@
7676
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.begin.hcl
7777
# ^^^^^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl
7878
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.end.hcl
79+
> "attr2" = var.test == "foo" ? "true" : "false"
80+
#^^^^^^^^ source.hcl meta.block.hcl meta.braces.hcl
81+
# ^ source.hcl meta.block.hcl meta.braces.hcl meta.mapping.key.hcl string.quoted.double.hcl punctuation.definition.string.begin.hcl
82+
# ^^^^^ source.hcl meta.block.hcl meta.braces.hcl meta.mapping.key.hcl string.quoted.double.hcl
83+
# ^ source.hcl meta.block.hcl meta.braces.hcl meta.mapping.key.hcl string.quoted.double.hcl punctuation.definition.string.end.hcl
84+
# ^ source.hcl meta.block.hcl meta.braces.hcl
85+
# ^ source.hcl meta.block.hcl meta.braces.hcl keyword.operator.hcl
86+
# ^ source.hcl meta.block.hcl meta.braces.hcl
87+
# ^^^^^^^^^ source.hcl meta.block.hcl meta.braces.hcl
88+
# ^^ source.hcl meta.block.hcl meta.braces.hcl keyword.operator.hcl
89+
# ^ source.hcl meta.block.hcl meta.braces.hcl
90+
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.begin.hcl
91+
# ^^^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl
92+
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.end.hcl
93+
# ^ source.hcl meta.block.hcl meta.braces.hcl
94+
# ^ source.hcl meta.block.hcl meta.braces.hcl keyword.operator.hcl
95+
# ^ source.hcl meta.block.hcl meta.braces.hcl
96+
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.begin.hcl
97+
# ^^^^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl
98+
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.end.hcl
99+
# ^ source.hcl meta.block.hcl meta.braces.hcl
100+
# ^ source.hcl meta.block.hcl meta.braces.hcl keyword.operator.hcl
101+
# ^ source.hcl meta.block.hcl meta.braces.hcl
102+
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.begin.hcl
103+
# ^^^^^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl
104+
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.end.hcl
105+
> (attr2) = var.test == "foo" ? "true" : "false"
106+
#^^^^^^^^^ source.hcl meta.block.hcl meta.braces.hcl meta.mapping.key.hcl punctuation.section.parens.begin.hcl
107+
# ^^^^^ source.hcl meta.block.hcl meta.braces.hcl meta.mapping.key.hcl
108+
# ^ source.hcl meta.block.hcl meta.braces.hcl meta.mapping.key.hcl punctuation.section.parens.end.hcl
109+
# ^ source.hcl meta.block.hcl meta.braces.hcl meta.mapping.key.hcl
110+
# ^ source.hcl meta.block.hcl meta.braces.hcl meta.mapping.key.hcl keyword.operator.hcl
111+
# ^ source.hcl meta.block.hcl meta.braces.hcl meta.mapping.key.hcl
112+
# ^^^^^^^^^ source.hcl meta.block.hcl meta.braces.hcl
113+
# ^^ source.hcl meta.block.hcl meta.braces.hcl keyword.operator.hcl
114+
# ^ source.hcl meta.block.hcl meta.braces.hcl
115+
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.begin.hcl
116+
# ^^^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl
117+
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.end.hcl
118+
# ^ source.hcl meta.block.hcl meta.braces.hcl
119+
# ^ source.hcl meta.block.hcl meta.braces.hcl keyword.operator.hcl
120+
# ^ source.hcl meta.block.hcl meta.braces.hcl
121+
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.begin.hcl
122+
# ^^^^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl
123+
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.end.hcl
124+
# ^ source.hcl meta.block.hcl meta.braces.hcl
125+
# ^ source.hcl meta.block.hcl meta.braces.hcl keyword.operator.hcl
126+
# ^ source.hcl meta.block.hcl meta.braces.hcl
127+
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.begin.hcl
128+
# ^^^^^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl
129+
# ^ source.hcl meta.block.hcl meta.braces.hcl string.quoted.double.hcl punctuation.definition.string.end.hcl
79130
> }
80131
#^^^^ source.hcl meta.block.hcl meta.braces.hcl
81132
# ^ source.hcl meta.block.hcl meta.braces.hcl punctuation.section.braces.end.hcl

0 commit comments

Comments
 (0)