Merge pull request #113 from goccy/feature/fix-crlf-in-double-quote

Fix new line character in string surrounded by double quote
goccy · Jun 2, 2020 · 6280ab6 · 6280ab6
2 parents aefe2e5 + 1ee2aed
commit 6280ab6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -68,6 +68,7 @@ func TestParser(t *testing.T) {
 		"v:\n- A\n- >-\n  B\n  C\n",
 		"v: |-\n  0\n",
 		"v: |-\n  0\nx: 0",
+		`"a\n1\nb"`,
 	}
 	for _, src := range sources {
 		fmt.Printf(src)

diff --git a/scanner/scanner.go b/scanner/scanner.go
@@ -216,7 +216,7 @@ func (s *Scanner) scanSingleQuote(ctx *Context) (tk *token.Token, pos int) {
 			continue
 		}
 		tk = token.SingleQuote(string(value), string(ctx.obuf), s.pos())
-		pos = len([]rune(value)) + 1
+		pos = idx - startIndex + 1
 		return
 	}
 	return
@@ -237,6 +237,11 @@ func (s *Scanner) scanDoubleQuote(ctx *Context) (tk *token.Token, pos int) {
 			if idx+1 < size {
 				nextChar := src[idx+1]
 				switch nextChar {
+				case 'n':
+					ctx.addOriginBuf(nextChar)
+					value = append(value, '\n')
+					idx++
+					continue
 				case '"':
 					ctx.addOriginBuf(nextChar)
 					value = append(value, nextChar)
@@ -253,9 +258,8 @@ func (s *Scanner) scanDoubleQuote(ctx *Context) (tk *token.Token, pos int) {
 			value = append(value, c)
 			continue
 		}
-
 		tk = token.DoubleQuote(string(value), string(ctx.obuf), s.pos())
-		pos = len([]rune(value)) + 1
+		pos = idx - startIndex + 1
 		return
 	}
 	return