Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct EOL offset for lines ending with multi-byte char (#471)

This commit is contained in:
Suguru Yamamoto 2022-10-27 00:00:27 +09:00 committed by GitHub
parent 3e73462e04
commit 2679db1d10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ast/operations.rs
View File

@ -140,9 +140,9 @@ impl<'a> SourceCodeLocator<'a> {
for line in self.content.lines() {
let mut newline = 0;
let mut line_offsets: Vec<usize> = vec![];
for (i, _char) in line.char_indices() {
for (i, char) in line.char_indices() {
line_offsets.push(offset + i);
newline = i + 1;
newline = i + char.len_utf8();
}
line_offsets.push(offset + newline);
self.offsets.push(line_offsets);
@ -183,3 +183,23 @@ impl<'a> SourceCodeLocator<'a> {
)
}
}
#[cfg(test)]
mod tests {
use super::SourceCodeLocator;
#[test]
fn source_code_locator_init() {
let content = "# \u{4e9c}\nclass Foo:\n \"\"\".\"\"\"";
let mut locator = SourceCodeLocator::new(content);
locator.init();
assert_eq!(locator.offsets.len(), 4);
assert_eq!(locator.offsets[0], [0, 1, 2, 5]);
assert_eq!(locator.offsets[1], [6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
assert_eq!(
locator.offsets[2],
[17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28]
);
assert_eq!(locator.offsets[3], [29]);
}
}