user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #2973 in Windows CRLF env.

Browse source
This commit is contained in:
Shohei Wada 2018-12-24 06:12:28 +09:00
parent a1ee7e9565
commit f3f511af1b
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/comment.rs
View file

@ -1304,7 +1304,13 @@ impl<'a> Iterator for LineClasses<'a> {
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) => {