hclwrite: Do not add spaces before template control sequences

BitYadou · Aug 9, 2019 · 72d3287 · 72d3287
1 parent 65731f3
commit 72d3287
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/hclwrite/format.go b/hclwrite/format.go
@@ -317,7 +317,7 @@ func spaceAfterToken(subject, before, after *Token) bool {
  return true
 
  // Don't add spaces between interpolated items
- case subject.Type == hclsyntax.TokenTemplateSeqEnd && after.Type == hclsyntax.TokenTemplateInterp:
+ case subject.Type == hclsyntax.TokenTemplateSeqEnd && (after.Type == hclsyntax.TokenTemplateInterp || after.Type == hclsyntax.TokenTemplateControl):
  return false
 
  case tokenBracketChange(subject) > 0:

diff --git a/hclwrite/format_test.go b/hclwrite/format_test.go
@@ -79,6 +79,10 @@ func TestFormat(t *testing.T) {
  `a="${b}${c}${ d } ${e}"`,
  `a = "${b}${c}${d} ${e}"`,
  },
+ {
+ `"%{if true}${var.foo}%{endif}"`,
+ `"%{if true}${var.foo}%{endif}"`,
+ },
  {
  `b{}`,
  `b {}`,