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

Skip BOM when inserting start-of-file imports (#7622)

Browse source 
See:
https://github.com/astral-sh/ruff/issues/7455#issuecomment-1732387485.
This commit is contained in:
Charlie Marsh 2023-09-23 15:36:50 -04:00 • committed by GitHub
parent b194f59aab
commit 8ba8896a7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/ruff_source_file/src/locator.rs
View file

@ -76,7 +76,15 @@ impl<'a> Locator<'a> {
if let Some(index) = memrchr2(b'\n', b'\r', bytes) {
// SAFETY: Safe because `index < offset`
TextSize::try_from(index).unwrap().add(TextSize::from(1))
} else if self.contents.starts_with('\u{feff}') {
} else {
self.contents_start()
}
}
/// Computes the start position of the file contents: either the first byte, or the byte after
/// the BOM.
pub fn contents_start(&self) -> TextSize {
if self.contents.starts_with('\u{feff}') {
// Skip the BOM.
'\u{feff}'.text_len()
} else {
@ -85,9 +93,9 @@ impl<'a> Locator<'a> {
}
}
/// Returns `true` if `offset` is at the start of a line.
pub fn is_at_start_of_line(&self, offset: TextSize) -> bool {
offset == TextSize::from(0)
|| self.contents[TextRange::up_to(offset)].ends_with(['\n', '\r'])
self.line_start(offset) == offset
}
/// Computes the offset that is right after the newline character that ends `offset`'s line.