In Windows files, detect CR without LF as well as LF without CR

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2020-04-01 13:35:46 +02:00
parent 0d5b016709
commit 368ccd416b

View file

@ -140,7 +140,7 @@ class UnixLineEndingIssueTracker(LineIssueTracker):
class WindowsLineEndingIssueTracker(LineIssueTracker): class WindowsLineEndingIssueTracker(LineIssueTracker):
"""Track files with non-Windows line endings (i.e. files without CR).""" """Track files with non-Windows line endings (i.e. CR or LF not in CRLF)."""
heading = "Non-Windows line endings:" heading = "Non-Windows line endings:"
@ -148,7 +148,7 @@ class WindowsLineEndingIssueTracker(LineIssueTracker):
return is_windows_file(filepath) return is_windows_file(filepath)
def issue_with_line(self, line, _filepath): def issue_with_line(self, line, _filepath):
return not line.endswith(b"\r\n") return not line.endswith(b"\r\n") or b"\r" in line[:-2]
class TrailingWhitespaceIssueTracker(LineIssueTracker): class TrailingWhitespaceIssueTracker(LineIssueTracker):