VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2025-12-09 14:14:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify the regexes

Browse Source
This commit is contained in:
Dave Halter
2019-01-10 01:21:56 +01:00
parent 610a820799
commit 94c2681c8e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
parso/python/diff.py
View File

@@ -388,8 +388,10 @@ class DiffParser(object):
# endmarker or another dedented code block. # endmarker or another dedented code block.
typ, string, start_pos, prefix = next(tokens) typ, string, start_pos, prefix = next(tokens)
if '\n' in prefix or '\r' in prefix: if '\n' in prefix or '\r' in prefix:
prefix = re.sub(r'(?<=\n|\r)[^\n\r]+$', '', prefix) prefix = re.sub(r'[^\n\r]+\Z', '', prefix)
else: else:
# This is basically the next line and it still needs to
# be parserd.
prefix = '' prefix = ''
yield PythonToken( yield PythonToken(
PythonTokenTypes.ENDMARKER, '', PythonTokenTypes.ENDMARKER, '',

5
test/test_diff_parser.py
View File

@@ -955,6 +955,10 @@ def test_wrong_backslash(differ):
differ.parse(code1, parsers=1, copies=1) differ.parse(code1, parsers=1, copies=1)
def test_comment_change(differ):
differ.initialize('')
def test_random_unicode_characters(differ): def test_random_unicode_characters(differ):
""" """
Those issues were all found with the fuzzer. Those issues were all found with the fuzzer.
@@ -970,3 +974,4 @@ def test_random_unicode_characters(differ):
differ.parse(s + '\n', parsers=1, expect_error_leaves=True) differ.parse(s + '\n', parsers=1, expect_error_leaves=True)
differ.parse(' result = (\r\f\x17\t\x11res)', parsers=2, expect_error_leaves=True) differ.parse(' result = (\r\f\x17\t\x11res)', parsers=2, expect_error_leaves=True)
differ.parse('') differ.parse('')
differ.parse(' a( # xx\ndef', parsers=2, expect_error_leaves=True)