Skip to content

Fix line numbers #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
satyakigh wants to merge 2 commits into from
Closed

Fix line numbers #131

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f08a129
Fix yaml line numbers
satyakigh Jul 6, 2026
9143330
Merge branch 'main' into yaml-line
satyakigh Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/template-model/src/parser/yaml.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,14 @@ impl MarkedEventReceiver for CfnYamlLoader {
}
self.path_stack.push(v.clone());
let path = self.current_path();
// mark.line() and mark.col() are 0-based
self.span_map.insert(path, (mark.line() as u32 + 1, mark.col() as u32 + 1));
// yaml_rust2 Marker reports line 1-based but column 0-based,
// so only the column is shifted to the 1-based column every
// other diagnostic reports (see the parse-error path above).
self.span_map.insert(path, (mark.line() as u32, mark.col() as u32 + 1));
// Remember this key's position so a later duplicate of it
// can be anchored at the offending occurrence.
if let Some(slot) = self.key_marks.last_mut() {
*slot = Some((mark.line() as u32 + 1, mark.col() as u32 + 1));
*slot = Some((mark.line() as u32, mark.col() as u32 + 1));
}
}
} else if matches!(parent.0, Yaml::Array(_))
Expand Down
Loading