internal/third_party/yaml: improve yaml positining
- retain more of the original spacing into the conversion
- store original absolute positions
Change-Id: Id1edbefe1050e1f2dcec3ceb2f8877018b0b5876
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/2562
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
diff --git a/internal/third_party/yaml/scannerc.go b/internal/third_party/yaml/scannerc.go
index 2229abc..94ace4b 100644
--- a/internal/third_party/yaml/scannerc.go
+++ b/internal/third_party/yaml/scannerc.go
@@ -1459,7 +1459,6 @@
// Eat a comment until a line break.
if parser.buffer[parser.buffer_pos] == '#' {
- rel := parser.relPos()
m := parser.mark
parser.comment_buffer = parser.comment_buffer[:0]
for !is_breakz(parser.buffer, parser.buffer_pos) {
@@ -1471,7 +1470,7 @@
return false
}
}
- add_comment(parser, rel, m, string(parser.comment_buffer))
+ add_comment(parser, m, string(parser.comment_buffer))
}
// If it is a line break, eat it.
@@ -1569,7 +1568,6 @@
}
if parser.buffer[parser.buffer_pos] == '#' {
- rel := parser.relPos()
m := parser.mark
parser.comment_buffer = parser.comment_buffer[:0]
for !is_breakz(parser.buffer, parser.buffer_pos) {
@@ -1581,7 +1579,7 @@
return false
}
}
- add_comment(parser, rel, m, string(parser.comment_buffer))
+ add_comment(parser, m, string(parser.comment_buffer))
}
// Check if we are at the end of the line.
@@ -2146,7 +2144,6 @@
}
}
if parser.buffer[parser.buffer_pos] == '#' {
- rel := parser.relPos()
m := parser.mark
parser.comment_buffer = parser.comment_buffer[:0]
for !is_breakz(parser.buffer, parser.buffer_pos) {
@@ -2158,7 +2155,7 @@
return false
}
}
- add_comment(parser, rel, m, string(parser.comment_buffer))
+ add_comment(parser, m, string(parser.comment_buffer))
}
// Check if we are at the end of the line.
