Merge pull request #79 from Junya/fix-vertical-format

Fix unexpected format when files do not end with newline
minamijoyo · Jun 12, 2023 · 841dda9 · 841dda9
2 parents 918a16d + 44bb74f
commit 841dda9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/editor/filter_vertical_formatter.go b/editor/filter_vertical_formatter.go
@@ -62,6 +62,9 @@ func trimTrailingDuplicatedNewLine(tokens hclwrite.Tokens) hclwrite.Tokens {
 		if tokens[end-1].Type == hclsyntax.TokenEOF {
 			// skip EOF
 			eof = tokens[end-1]
+			if tokens[end-2].Type != hclsyntax.TokenNewline {
+				break
+			}
 			continue
 		}
 		if tokens[end-1].Type == hclsyntax.TokenNewline &&

diff --git a/editor/filter_vertical_formatter_test.go b/editor/filter_vertical_formatter_test.go
@@ -44,6 +44,12 @@ b1 {
 b2 l1 {}
 `,
 		},
+		{
+			name: "non-POSIX style end of file",
+			src:  `a0 = v0`,
+			ok:   true,
+			want: `a0 = v0`,
+		},
 	}
 
 	for _, tc := range cases {