mirror of
https://github.com/astral-sh/ruff
synced 2026-01-22 22:10:48 -05:00
# Summary We need to support CR line endings (as opposed to LF and CRLF line endings, which are already supported). They're rare, but they do appear in Python code, and we tend to panic on any file that uses them. Our `Locator` abstraction now supports CR line endings. However, Rust's `str#lines` implementation does _not_. This PR adds a `UniversalNewlineIterator` implementation that respects all of CR, LF, and CRLF line endings, and plugs it into most of the `.lines()` call sites. As an alternative design, it could be nice if we could leverage `Locator` for this. We've already computed all of the line endings, so we could probably iterate much more efficiently? # Test Plan Largely relying on automated testing, however, also ran over some known failure cases, like #3404.
193 lines
5.7 KiB
Rust
193 lines
5.7 KiB
Rust
use std::iter::FusedIterator;
|
|
|
|
/// Extension trait for [`str`] that provides a [`UniversalNewlineIterator`].
|
|
pub trait StrExt {
|
|
fn universal_newlines(&self) -> UniversalNewlineIterator<'_>;
|
|
}
|
|
|
|
impl StrExt for str {
|
|
fn universal_newlines(&self) -> UniversalNewlineIterator<'_> {
|
|
UniversalNewlineIterator::from(self)
|
|
}
|
|
}
|
|
|
|
/// Like [`str#lines`], but accommodates LF, CRLF, and CR line endings,
|
|
/// the latter of which are not supported by [`str#lines`].
|
|
///
|
|
/// ## Examples
|
|
///
|
|
/// ```rust
|
|
/// use ruff_python_ast::newlines::UniversalNewlineIterator;
|
|
///
|
|
/// let mut lines = UniversalNewlineIterator::from("foo\nbar\n\r\nbaz\rbop");
|
|
///
|
|
/// assert_eq!(lines.next_back(), Some("bop"));
|
|
/// assert_eq!(lines.next(), Some("foo"));
|
|
/// assert_eq!(lines.next_back(), Some("baz"));
|
|
/// assert_eq!(lines.next(), Some("bar"));
|
|
/// assert_eq!(lines.next_back(), Some(""));
|
|
/// assert_eq!(lines.next(), None);
|
|
/// ```
|
|
pub struct UniversalNewlineIterator<'a> {
|
|
text: &'a str,
|
|
}
|
|
|
|
impl<'a> UniversalNewlineIterator<'a> {
|
|
pub fn from(text: &'a str) -> UniversalNewlineIterator<'a> {
|
|
UniversalNewlineIterator { text }
|
|
}
|
|
}
|
|
|
|
impl<'a> Iterator for UniversalNewlineIterator<'a> {
|
|
type Item = &'a str;
|
|
|
|
#[inline]
|
|
fn next(&mut self) -> Option<&'a str> {
|
|
if self.text.is_empty() {
|
|
return None;
|
|
}
|
|
|
|
let line = match self.text.find(['\n', '\r']) {
|
|
// Non-last line
|
|
Some(line_end) => {
|
|
let (line, remainder) = self.text.split_at(line_end);
|
|
|
|
self.text = match remainder.as_bytes()[0] {
|
|
// Explicit branch for `\n` as this is the most likely path
|
|
b'\n' => &remainder[1..],
|
|
// '\r\n'
|
|
b'\r' if remainder.as_bytes().get(1) == Some(&b'\n') => &remainder[2..],
|
|
// '\r'
|
|
_ => &remainder[1..],
|
|
};
|
|
|
|
line
|
|
}
|
|
// Last line
|
|
None => std::mem::take(&mut self.text),
|
|
};
|
|
|
|
Some(line)
|
|
}
|
|
|
|
fn last(mut self) -> Option<Self::Item> {
|
|
self.next_back()
|
|
}
|
|
}
|
|
|
|
impl DoubleEndedIterator for UniversalNewlineIterator<'_> {
|
|
#[inline]
|
|
fn next_back(&mut self) -> Option<Self::Item> {
|
|
if self.text.is_empty() {
|
|
return None;
|
|
}
|
|
|
|
let len = self.text.len();
|
|
|
|
// Trim any trailing newlines.
|
|
self.text = match self.text.as_bytes()[len - 1] {
|
|
b'\n' if len > 1 && self.text.as_bytes()[len - 2] == b'\r' => &self.text[..len - 2],
|
|
b'\n' | b'\r' => &self.text[..len - 1],
|
|
_ => self.text,
|
|
};
|
|
|
|
// Find the end of the previous line. The previous line is the text up to, but not including
|
|
// the newline character.
|
|
let line = match self.text.rfind(['\n', '\r']) {
|
|
// '\n' or '\r' or '\r\n'
|
|
Some(line_end) => {
|
|
let (remainder, line) = self.text.split_at(line_end + 1);
|
|
self.text = remainder;
|
|
|
|
line
|
|
}
|
|
// Last line
|
|
None => std::mem::take(&mut self.text),
|
|
};
|
|
|
|
Some(line)
|
|
}
|
|
}
|
|
|
|
impl FusedIterator for UniversalNewlineIterator<'_> {}
|
|
|
|
/// Like [`UniversalNewlineIterator`], but includes a trailing newline as an empty line.
|
|
pub struct NewlineWithTrailingNewline<'a> {
|
|
trailing: Option<&'a str>,
|
|
underlying: UniversalNewlineIterator<'a>,
|
|
}
|
|
|
|
impl<'a> NewlineWithTrailingNewline<'a> {
|
|
pub fn from(input: &'a str) -> NewlineWithTrailingNewline<'a> {
|
|
NewlineWithTrailingNewline {
|
|
underlying: UniversalNewlineIterator::from(input),
|
|
trailing: if input.ends_with(['\r', '\n']) {
|
|
Some("")
|
|
} else {
|
|
None
|
|
},
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<'a> Iterator for NewlineWithTrailingNewline<'a> {
|
|
type Item = &'a str;
|
|
|
|
#[inline]
|
|
fn next(&mut self) -> Option<&'a str> {
|
|
self.underlying.next().or_else(|| self.trailing.take())
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::UniversalNewlineIterator;
|
|
|
|
#[test]
|
|
fn universal_newlines_empty_str() {
|
|
let lines: Vec<_> = UniversalNewlineIterator::from("").collect();
|
|
assert_eq!(lines, Vec::<&str>::default());
|
|
|
|
let lines: Vec<_> = UniversalNewlineIterator::from("").rev().collect();
|
|
assert_eq!(lines, Vec::<&str>::default());
|
|
}
|
|
|
|
#[test]
|
|
fn universal_newlines_forward() {
|
|
let lines: Vec<_> = UniversalNewlineIterator::from("foo\nbar\n\r\nbaz\rbop").collect();
|
|
assert_eq!(lines, vec!["foo", "bar", "", "baz", "bop"]);
|
|
|
|
let lines: Vec<_> = UniversalNewlineIterator::from("foo\nbar\n\r\nbaz\rbop\n").collect();
|
|
assert_eq!(lines, vec!["foo", "bar", "", "baz", "bop"]);
|
|
|
|
let lines: Vec<_> = UniversalNewlineIterator::from("foo\nbar\n\r\nbaz\rbop\n\n").collect();
|
|
assert_eq!(lines, vec!["foo", "bar", "", "baz", "bop", ""]);
|
|
}
|
|
|
|
#[test]
|
|
fn universal_newlines_backwards() {
|
|
let lines: Vec<_> = UniversalNewlineIterator::from("foo\nbar\n\r\nbaz\rbop")
|
|
.rev()
|
|
.collect();
|
|
assert_eq!(lines, vec!["bop", "baz", "", "bar", "foo"]);
|
|
|
|
let lines: Vec<_> = UniversalNewlineIterator::from("foo\nbar\n\nbaz\rbop\n")
|
|
.rev()
|
|
.collect();
|
|
|
|
assert_eq!(lines, vec!["bop", "baz", "", "bar", "foo"]);
|
|
}
|
|
|
|
#[test]
|
|
fn universal_newlines_mixed() {
|
|
let mut lines = UniversalNewlineIterator::from("foo\nbar\n\r\nbaz\rbop");
|
|
|
|
assert_eq!(lines.next_back(), Some("bop"));
|
|
assert_eq!(lines.next(), Some("foo"));
|
|
assert_eq!(lines.next_back(), Some("baz"));
|
|
assert_eq!(lines.next(), Some("bar"));
|
|
assert_eq!(lines.next_back(), Some(""));
|
|
assert_eq!(lines.next(), None);
|
|
}
|
|
}
|