Fix suppress an empty token in empty list

minamijoyo · Apr 4, 2022 · 44e85c8 · 44e85c8
1 parent cd38f8b
commit 44e85c8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/tfwrite/hclwritex.go b/tfwrite/hclwritex.go
@@ -32,7 +32,10 @@ func SplitTokensAsList(tokens hclwrite.Tokens) []hclwrite.Tokens {
 	for ; end < len(tokens); end++ {
 		// Find a `]` token
 		if tokens[end].Type == hclsyntax.TokenCBrack {
-			ret = append(ret, tokens[begin:end])
+			elm := tokens[begin:end]
+			if len(elm) > 0 {
+				ret = append(ret, elm)
+			}
 			foundCBrack = true
 			break
 		}

diff --git a/tfwrite/hclwritex_test.go b/tfwrite/hclwritex_test.go
@@ -31,6 +31,26 @@ foo {
 			},
 			ok: true,
 		},
+		{
+			desc: "empty string (invalid list)",
+			src: `
+foo {
+  attr = ""
+}
+`,
+			want: nil,
+			ok:   true,
+		},
+		{
+			desc: "empty list",
+			src: `
+foo {
+  attr = []
+}
+`,
+			want: []hclwrite.Tokens{},
+			ok:   true,
+		},
 		{
 			desc: "variable",
 			src: `