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

2 files changed, 27 insertions, 3 deletions

diff --git a/hclwrite/format.go b/hclwrite/format.go
index eed0694..22b1919 100644
--- 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
index c07be97..6615be8 100644
--- a/hclwrite/format_test.go
+++ b/hclwrite/format_test.go
@@ -522,6 +522,30 @@ EOT
 }
 `,
 		},
+		{
+			`
+foo {
+bar = <<EOT
+Foo bar baz
+EOT
+}
+
+baz {
+default="string"
+}
+`,
+			`
+foo {
+  bar = <<EOT
+Foo bar baz
+EOT
+}
+
+baz {
+  default = "string"
+}
+`,
+		},
 	}
 
 	for i, test := range tests {