mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-16 04:55:22 +03:00
Fix #2973 in Windows CRLF env.
This commit is contained in:
+7
-1
@@ -1304,7 +1304,13 @@ fn next(&mut self) -> Option<Self::Item> {
|
||||
None => FullCodeCharKind::Normal,
|
||||
};
|
||||
|
||||
while let Some((kind, c)) = self.base.next() {
|
||||
while let Some((kind, mut c)) = self.base.next() {
|
||||
// If \r\n newline appears, consume one more character.
|
||||
// Then do the same process with the single \n case.
|
||||
if c == '\r' && self.base.peek().map_or(false, |(_, c2)| *c2 == '\n') {
|
||||
self.base.next();
|
||||
c = '\n';
|
||||
}
|
||||
if c == '\n' {
|
||||
self.kind = match (start_class, kind) {
|
||||
(FullCodeCharKind::Normal, FullCodeCharKind::InString) => {
|
||||
|
||||
Reference in New Issue
Block a user