hclwrite: heredoc tokens are in line.lead, not line.assign (hashicorp#95

)
BitYadou · Mar 15, 2019 · 956e03e · 956e03e
1 parent fdf8e23
commit 956e03e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/hclwrite/format.go b/hclwrite/format.go
@@ -79,13 +79,13 @@ func formatIndent(lines []formatLine) {
  netBrackets := 0
  for _, token := range line.lead {
  netBrackets += tokenBracketChange(token)
- }
- for _, token := range line.assign {
- netBrackets += tokenBracketChange(token)
  if token.Type == hclsyntax.TokenOHeredoc {
  inHeredoc = true
  }
  }
+ for _, token := range line.assign {
+ netBrackets += tokenBracketChange(token)
+ }
 
  switch {
  case netBrackets > 0:

diff --git a/hclwrite/format_test.go b/hclwrite/format_test.go
@@ -520,6 +520,30 @@ foo {
  ${a}${b}${c} ${d}
 EOT
 }
+`,
+ },
+ {
+ `
+foo {
+bar = <<EOT
+Foo bar baz
+EOT
+}
+
+baz {
+default="string"
+}
+`,
+ `
+foo {
+ bar = <<EOT
+Foo bar baz
+EOT
+}
+
+baz {
+ default = "string"
+}
 `,
  },
  }