Add support for CR line ending for mixed_line_ending.py

'--fix=cr' is not yet implemented though
This commit is contained in:
Morgan Courbet 2017-07-10 21:50:27 +02:00
parent 4fc9624b6a
commit 19377889df
No known key found for this signature in database
GPG key ID: 467299D324A21B24
2 changed files with 45 additions and 4 deletions

View file

@ -31,10 +31,11 @@ class MixedLineEndingOption(Enum):
class MixedLineDetection(Enum):
MIXED_MOSTLY_CRLF = 1, True, LineEnding.CRLF
MIXED_MOSTLY_LF = 2, True, LineEnding.LF
NOT_MIXED = 3, False, None
UNKNOWN = 4, False, None
NOT_MIXED = 1, False, None
UNKNOWN = 2, False, None
MIXED_MOSTLY_CRLF = 3, True, LineEnding.CRLF
MIXED_MOSTLY_LF = 4, True, LineEnding.LF
MIXED_MOSTLY_CR = 5, True, LineEnding.CR
def __init__(self, index, mle_found, line_ending_enum):
# TODO hack to prevent enum overriding

View file

@ -8,12 +8,22 @@ TESTS_FIX_AUTO = (
(b'foo\nbar\nbaz\n', 0, b'foo\nbar\nbaz\n'),
# only 'CRLF'
(b'foo\r\nbar\r\nbaz\r\n', 0, b'foo\r\nbar\r\nbaz\r\n'),
# only 'CR'
(b'foo\rbar\rbaz\r', 0, b'foo\rbar\rbaz\r'),
# mixed with majority of 'LF'
(b'foo\r\nbar\nbaz\n', 1, b'foo\nbar\nbaz\n'),
# mixed with majority of 'CRLF'
(b'foo\r\nbar\nbaz\r\n', 1, b'foo\r\nbar\r\nbaz\r\n'),
# mixed with majority of 'CR'
(b'foo\rbar\nbaz\r', 1, b'foo\rbar\rbaz\r'),
# mixed with as much 'LF' as 'CRLF'
(b'foo\r\nbar\nbaz', 1, b'foo\r\nbar\nbaz'),
# mixed with as much 'LF' as 'CR'
(b'foo\rbar\nbaz', 1, b'foo\rbar\nbaz'),
# mixed with as much 'CRLF' as 'CR'
(b'foo\r\nbar\nbaz', 1, b'foo\r\nbar\nbaz'),
# mixed with as much 'CRLF' as 'LF' as 'CR'
(b'foo\r\nbar\nbaz\r', 1, b'foo\r\nbar\nbaz\r'),
)
@ -34,10 +44,20 @@ TESTS_NO_FIX = (
(b'foo\nbar\nbaz\n', 0, b'foo\nbar\nbaz\n'),
# only 'CRLF'
(b'foo\r\nbar\r\nbaz\r\n', 0, b'foo\r\nbar\r\nbaz\r\n'),
# only 'CR'
(b'foo\rbar\rbaz\r', 0, b'foo\rbar\rbaz\r'),
# mixed with majority of 'LF'
(b'foo\r\nbar\nbaz\n', 1, b'foo\r\nbar\nbaz\n'),
# mixed with majority of 'CRLF'
(b'foo\r\nbar\nbaz\r\n', 1, b'foo\r\nbar\nbaz\r\n'),
# mixed with majority of 'CR'
(b'foo\rbar\nbaz\r', 1, b'foo\rbar\nbaz\r'),
# mixed with as much 'LF' as 'CR'
(b'foo\rbar\nbaz', 0, b'foo\rbar\nbaz'),
# mixed with as much 'CRLF' as 'CR'
(b'foo\r\nbar\nbaz', 0, b'foo\r\nbar\nbaz'),
# mixed with as much 'CRLF' as 'LF' as 'CR'
(b'foo\r\nbar\nbaz\r', 0, b'foo\r\nbar\nbaz\r'),
)
@ -58,10 +78,20 @@ TESTS_FIX_FORCE_LF = (
(b'foo\nbar\nbaz\n', 1, b'foo\nbar\nbaz\n'),
# only 'CRLF'
(b'foo\r\nbar\r\nbaz\r\n', 1, b'foo\nbar\nbaz\n'),
# only 'CR'
(b'foo\rbar\rbaz\r', 1, b'foo\nbar\nbaz\n'),
# mixed with majority of 'LF'
(b'foo\r\nbar\nbaz\n', 1, b'foo\nbar\nbaz\n'),
# mixed with majority of 'CRLF'
(b'foo\r\nbar\nbaz\r\n', 1, b'foo\nbar\nbaz\n'),
# mixed with majority of 'CR'
(b'foo\rbar\nbaz\r', 1, b'foo\nbar\nbaz\n'),
# mixed with as much 'LF' as 'CR'
(b'foo\rbar\nbaz', 1, b'foo\nbar\nbaz'),
# mixed with as much 'CRLF' as 'CR'
(b'foo\r\nbar\nbaz', 1, b'foo\nbar\nbaz'),
# mixed with as much 'CRLF' as 'LF' as 'CR'
(b'foo\r\nbar\nbaz\r', 1, b'foo\nbar\nbaz\n'),
)
@ -83,10 +113,20 @@ TESTS_FIX_FORCE_CRLF = (
(b'foo\nbar\nbaz\n', 1, b'foo\r\nbar\r\nbaz\r\n'),
# only 'CRLF'
(b'foo\r\nbar\r\nbaz\r\n', 1, b'foo\r\nbar\r\nbaz\r\n'),
# only 'CR'
(b'foo\rbar\rbaz\r', 1, b'foo\r\nbar\r\nbaz\r\n'),
# mixed with majority of 'LF'
(b'foo\r\nbar\nbaz\n', 1, b'foo\r\nbar\r\nbaz\r\n'),
# mixed with majority of 'CRLF'
(b'foo\r\nbar\nbaz\r\n', 1, b'foo\r\nbar\r\nbaz\r\n'),
# mixed with majority of 'CR'
(b'foo\rbar\nbaz\r', 1, b'foo\r\nbar\r\nbaz\r\n'),
# mixed with as much 'LF' as 'CR'
(b'foo\rbar\nbaz', 1, b'foo\r\nbar\r\nbaz'),
# mixed with as much 'CRLF' as 'CR'
(b'foo\r\nbar\nbaz', 1, b'foo\r\nbar\r\nbaz'),
# mixed with as much 'CRLF' as 'LF' as 'CR'
(b'foo\r\nbar\nbaz\r', 1, b'foo\r\nbar\r\nbaz\r\n'),
)