hclwrite: No spaces before ... marker in argument lists or for exprs

BitYadou · May 15, 2019 · 4b22149 · 4b22149
1 parent d1ed8ee
commit 4b22149
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/hclwrite/format.go b/hclwrite/format.go
@@ -248,8 +248,8 @@ func spaceAfterToken(subject, before, after *Token) bool {
  // Don't use spaces around attribute access dots
  return false
 
- case after.Type == hclsyntax.TokenComma:
- // No space right before a comma in an argument list
+ case after.Type == hclsyntax.TokenComma || after.Type == hclsyntax.TokenEllipsis:
+ // No space right before a comma or ... in an argument list
  return false
 
  case subject.Type == hclsyntax.TokenComma:

diff --git a/hclwrite/format_test.go b/hclwrite/format_test.go
@@ -63,6 +63,10 @@ func TestFormat(t *testing.T) {
  `foo(1, -2,a*b, b,c)`,
  `foo(1, -2, a * b, b, c)`,
  },
+ {
+ `foo(a,b...)`,
+ `foo(a, b...)`,
+ },
  {
  `a="hello ${ name }"`,
  `a = "hello ${name}"`,