Merge pull request #127 from goccy/feature/fix-issue118

Fix processing of CRLF at parser
goccy · Jun 9, 2020 · afec5fb · afec5fb
2 parents 559f2ab + 163bb3c
commit afec5fb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/parser/parser.go b/parser/parser.go
@@ -75,7 +75,8 @@ func (p *parser) parseTag(ctx *context) (ast.Node, error) {
 }
 
 func (p *parser) removeLeftSideNewLineCharacter(src string) string {
-	return strings.TrimLeft(strings.TrimLeft(src, "\r"), "\n")
+	// CR or LF or CRLF
+	return strings.TrimLeft(strings.TrimLeft(strings.TrimLeft(src, "\r"), "\n"), "\r\n")
 }
 
 func (p *parser) existsNewLineCharacter(src string) bool {

diff --git a/parser/testdata/cr.yml b/parser/testdata/cr.yml
@@ -1 +1 @@
-a: "a"b: 1
+a: "a"b: 1

diff --git a/parser/testdata/crlf.yml b/parser/testdata/crlf.yml
@@ -1,2 +1,3 @@
 a: "a"
+
 b: 1
diff --git a/parser/testdata/lf.yml b/parser/testdata/lf.yml
@@ -1,2 +1,3 @@
 a: "a"
+
 b: 1
diff --git a/printer/printer.go b/printer/printer.go
@@ -201,11 +201,11 @@ func (p *Printer) PrintErrorMessage(msg string, isColored bool) string {
 }
 
 func (p *Printer) removeLeftSideNewLineChar(src string) string {
-	return strings.TrimLeft(strings.TrimLeft(src, "\r"), "\n")
+	return strings.TrimLeft(strings.TrimLeft(strings.TrimLeft(src, "\r"), "\n"), "\r\n")
 }
 
 func (p *Printer) removeRightSideNewLineChar(src string) string {
-	return strings.TrimRight(strings.TrimRight(src, "\r"), "\n")
+	return strings.TrimRight(strings.TrimRight(strings.TrimRight(src, "\r"), "\n"), "\r\n")
 }
 
 func (p *Printer) removeRightSideWhiteSpaceChar(src string) string {