Skip to content

Handle \r like \n to avoid difference of length between LF and CRLF line endings #1347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ghost wants to merge 2 commits into from
Closed

Handle \r like \n to avoid difference of length between LF and CRLF line endings #1347

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44505c7
\r is now treated like \n to avoid difference of behaviour between LF…
Mar 1, 2017
6429a9e
Fix according to nrc's suggestion.
Mar 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 56 additions & 43 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,11 +469,6 @@ fn format_lines(text: &mut StringBuffer, name: &str, config: &Config, report: &m
let mut issue_seeker = BadIssueSeeker::new(config.report_todo, config.report_fixme);

for (c, b) in text.chars() {
if c == '\r' {
line_len += c.len_utf8();
continue;
}

// Add warnings for bad todos/ fixmes
if let Some(issue) = issue_seeker.inspect(c) {
errors.push(FormattingError {
Expand All @@ -482,7 +477,7 @@ fn format_lines(text: &mut StringBuffer, name: &str, config: &Config, report: &m
});
}

if c == '\n' {
if c == '\n' || c == '\r' {
Copy link
Member

@nrc nrc Feb 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is quite right - a line ending in \r\n will be counted as two lines rather than one. I think it might be better to keep the original treatment, but don't increment line_len, although that assumes line_len is only used for the max line length test.

Copy link
Author

@ghost ghost Feb 28, 2017 •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you're right, my bad. By the way, if you have a better name for this PR, don't hesitate :P

// Check for (and record) trailing whitespace.
if let Some(lw) = last_wspace {
trims.push((cur_line, lw, b));
Expand Down