Fix end positions with error dedents

This commit is contained in:
Dave Halter
2019-01-13 13:59:31 +01:00
parent 3d402d0a77
commit e10802ab09
2 changed files with 46 additions and 17 deletions

View File

@@ -23,7 +23,7 @@ def test_simple():
def _check_error_leaves_nodes(node):
if node.type in ('error_leaf', 'error_node'):
return True
return node
try:
children = node.children
@@ -31,9 +31,10 @@ def _check_error_leaves_nodes(node):
pass
else:
for child in children:
if _check_error_leaves_nodes(child):
return True
return False
x_node = _check_error_leaves_nodes(child)
if x_node is not None:
return x_node
return None
class Differ(object):
@@ -63,10 +64,11 @@ class Differ(object):
assert code == new_module.get_code()
_assert_valid_graph(new_module)
assert diff_parser._copy_count == copies
assert diff_parser._parser_count == parsers
assert expect_error_leaves == _check_error_leaves_nodes(new_module)
error_node = _check_error_leaves_nodes(new_module)
assert expect_error_leaves == (error_node is not None), error_node
#assert diff_parser._parser_count == parsers
#assert diff_parser._copy_count == copies
return new_module
@@ -977,3 +979,24 @@ def test_random_unicode_characters(differ):
differ.parse(u' result = (\r\f\x17\t\x11res)', parsers=2, expect_error_leaves=True)
differ.parse('')
differ.parse(' a( # xx\ndef', parsers=2, expect_error_leaves=True)
def test_dedent_end_positions(differ):
code1 = dedent('''\
if 1:
if b:
2
c = {
5}
''')
code2 = dedent('''\
if 1:
if ⌟ഒᜈྡྷṭb:
2
'l': ''}
c = {
5}
''')
differ.initialize(code1)
differ.parse(code2, copies=6, parsers=14, expect_error_leaves=True)
differ.parse(code1, copies=6, parsers=11)