Also fix wide char handling on inline comments.

go-yaml · Jun 1, 2020 · 913338d · 913338d
1 parent 2ff61e1
commit 913338d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/node_test.go b/node_test.go
@@ -766,7 +766,7 @@ var nodeTests = []struct {
 		},
 	}, {
 
-		"# š\ntrue\n",
+		"# š\ntrue # š\n",
 		yaml.Node{
 			Kind:   yaml.DocumentNode,
 			Line:   2,
@@ -778,6 +778,7 @@ var nodeTests = []struct {
 				Line:        2,
 				Column:      1,
 				HeadComment: "# š",
+				LineComment: "# š",
 			}},
 		},
 	}, {

diff --git a/scannerc.go b/scannerc.go
@@ -2856,13 +2856,12 @@ func yaml_parser_scan_line_comment(parser *yaml_parser_t, token_mark yaml_mark_t
 						return false
 					}
 					skip_line(parser)
-				} else {
-					if parser.mark.index >= seen {
-						if len(text) == 0 {
-							start_mark = parser.mark
-						}
-						text = append(text, parser.buffer[parser.buffer_pos])
+				} else if parser.mark.index >= seen {
+					if len(text) == 0 {
+						start_mark = parser.mark
 					}
+					text = read(parser, text)
+				} else {
 					skip(parser)
 				}
 			}