Merge pull request #372 from hashicorp/format-objects-maps-on-multiple-lines

hclwrite: Generate multi-line objects and maps

hclwrite/examples_test.go

@@ -48,7 +48,11 @@ func Example_generateFromScratch() {
 	// Output:
 	// string = "foo"
 	//
-	// object = { bar = 5, baz = true, foo = "foo" }
+	// object = {
+	//   bar = 5
+	//   baz = true
+	//   foo = "foo"
+	// }
 	// bool = false
 	// path = env.PATH
 	//

hclwrite/generate.go

@@ -119,15 +119,15 @@ func appendTokensForValue(val cty.Value, toks Tokens) Tokens {
 			Type:  hclsyntax.TokenOBrace,
 			Bytes: []byte{'{'},
 		})
+		if val.LengthInt() > 0 {
+			toks = append(toks, &Token{
+				Type:  hclsyntax.TokenNewline,
+				Bytes: []byte{'\n'},
+			})
+		}
 
 		i := 0
 		for it := val.ElementIterator(); it.Next(); {
-			if i > 0 {
-				toks = append(toks, &Token{
-					Type:  hclsyntax.TokenComma,
-					Bytes: []byte{','},
-				})
-			}
 			eKey, eVal := it.Element()
 			if hclsyntax.ValidIdentifier(eKey.AsString()) {
 				toks = append(toks, &Token{
@@ -142,6 +142,10 @@ func appendTokensForValue(val cty.Value, toks Tokens) Tokens {
 				Bytes: []byte{'='},
 			})
 			toks = appendTokensForValue(eVal, toks)
+			toks = append(toks, &Token{
+				Type:  hclsyntax.TokenNewline,
+				Bytes: []byte{'\n'},
+			})
 			i++
 		}
 

hclwrite/generate_test.go

@@ -340,10 +340,14 @@ func TestTokensForValue(t *testing.T) {
 					Type:  hclsyntax.TokenOBrace,
 					Bytes: []byte(`{`),
 				},
+				{
+					Type:  hclsyntax.TokenNewline,
+					Bytes: []byte("\n"),
+				},
 				{
 					Type:         hclsyntax.TokenIdent,
 					Bytes:        []byte(`foo`),
-					SpacesBefore: 1,
+					SpacesBefore: 2,
 				},
 				{
 					Type:         hclsyntax.TokenEqual,
@@ -355,10 +359,13 @@ func TestTokensForValue(t *testing.T) {
 					Bytes:        []byte(`true`),
 					SpacesBefore: 1,
 				},
+				{
+					Type:  hclsyntax.TokenNewline,
+					Bytes: []byte("\n"),
+				},
 				{
 					Type:  hclsyntax.TokenCBrace,
 					Bytes: []byte(`}`),
-					SpacesBefore: 1,
 				},
 			},
 		},
@@ -372,10 +379,14 @@ func TestTokensForValue(t *testing.T) {
 					Type:  hclsyntax.TokenOBrace,
 					Bytes: []byte(`{`),
 				},
+				{
+					Type:  hclsyntax.TokenNewline,
+					Bytes: []byte("\n"),
+				},
 				{
 					Type:         hclsyntax.TokenIdent,
 					Bytes:        []byte(`bar`),
-					SpacesBefore: 1,
+					SpacesBefore: 2,
 				},
 				{
 					Type:         hclsyntax.TokenEqual,
@@ -388,13 +399,13 @@ func TestTokensForValue(t *testing.T) {
 					SpacesBefore: 1,
 				},
 				{
-					Type:  hclsyntax.TokenComma,
+					Type:  hclsyntax.TokenNewline,
-					Bytes: []byte(`,`),
+					Bytes: []byte("\n"),
 				},
 				{
 					Type:         hclsyntax.TokenIdent,
 					Bytes:        []byte(`foo`),
-					SpacesBefore: 1,
+					SpacesBefore: 2,
 				},
 				{
 					Type:         hclsyntax.TokenEqual,
@@ -406,10 +417,13 @@ func TestTokensForValue(t *testing.T) {
 					Bytes:        []byte(`true`),
 					SpacesBefore: 1,
 				},
+				{
+					Type:  hclsyntax.TokenNewline,
+					Bytes: []byte("\n"),
+				},
 				{
 					Type:  hclsyntax.TokenCBrace,
 					Bytes: []byte(`}`),
-					SpacesBefore: 1,
 				},
 			},
 		},
@@ -422,10 +436,14 @@ func TestTokensForValue(t *testing.T) {
 					Type:  hclsyntax.TokenOBrace,
 					Bytes: []byte(`{`),
 				},
+				{
+					Type:  hclsyntax.TokenNewline,
+					Bytes: []byte("\n"),
+				},
 				{
 					Type:         hclsyntax.TokenOQuote,
 					Bytes:        []byte(`"`),
-					SpacesBefore: 1,
+					SpacesBefore: 2,
 				},
 				{
 					Type:  hclsyntax.TokenQuotedLit,
@@ -445,10 +463,13 @@ func TestTokensForValue(t *testing.T) {
 					Bytes:        []byte(`true`),
 					SpacesBefore: 1,
 				},
+				{
+					Type:  hclsyntax.TokenNewline,
+					Bytes: []byte("\n"),
+				},
 				{
 					Type:  hclsyntax.TokenCBrace,
 					Bytes: []byte(`}`),
-					SpacesBefore: 1,
 				},
 			},
 		},