mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-26 20:10:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Implement consistent newline handling for SourceCodeLocator (#519)

Browse source
This commit is contained in:
Charlie Marsh 2022-10-30 13:11:08 -04:00 • committed by GitHub
parent dfa5a4f0f7
commit d3e7fdabb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/ast/operations.rs
View file

@ -137,15 +137,21 @@ impl<'a> SourceCodeLocator<'a> {
let mut offsets = vec![vec![]];
let mut line_index = 0;
let mut char_index = 0;
let mut newline = false;
for (i, char) in content.char_indices() {
offsets[line_index].push(i);
if char == '\n' {
char_index = i + char.len_utf8();
newline = char == '\n';
if newline {
line_index += 1;
offsets.push(vec![]);
}
char_index = i + char.len_utf8();
}
// If we end in a newline, add an extra character to indicate the start of that line.
if newline {
offsets[line_index].push(char_index);
}
offsets
}
@ -191,6 +197,19 @@ mod tests {
#[test]
fn source_code_locator_init() {
let content = "x = 1";
let locator = SourceCodeLocator::new(content);
let offsets = locator.get_or_init_offsets();
assert_eq!(offsets.len(), 1);
assert_eq!(offsets[0], [0, 1, 2, 3, 4]);
let content = "x = 1\n";
let locator = SourceCodeLocator::new(content);
let offsets = locator.get_or_init_offsets();
assert_eq!(offsets.len(), 2);
assert_eq!(offsets[0], [0, 1, 2, 3, 4, 5]);
assert_eq!(offsets[1], [6]);
let content = "x = 1\ny = 2\nz = x + y\n";
let locator = SourceCodeLocator::new(content);
let offsets = locator.get_or_init_offsets();
@ -206,6 +225,6 @@ mod tests {
assert_eq!(offsets.len(), 3);
assert_eq!(offsets[0], [0, 1, 2, 5]);
assert_eq!(offsets[1], [6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
assert_eq!(offsets[2], [17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28]);
assert_eq!(offsets[2], [17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27]);
}
}