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

Fix diff parser: Don't copy error nodes/leaves in the beginning, leads to strange issues in some cases

Browse Source
This commit is contained in:
Dave Halter
2019-01-17 23:48:00 +01:00
parent 32321a74b1
commit 197391dc53
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
parso/python/diff.py
View File

@@ -578,8 +578,14 @@ class _NodesTree(object):
Returns the number of tree nodes that were copied. Returns the number of tree nodes that were copied.
""" """
if tree_nodes[0].type == 'error_leaf' and tree_nodes[0].token_type == 'INDENT': i = 0
# Avoid copying error indents. Just parse them again. for i, n in enumerate(tree_nodes):
if tree_nodes[0].type not in ('INDENT', 'DEDENT'):
break
if tree_nodes[i].type in ('error_leaf', 'error_node'):
# Avoid copying errors in the beginning. Can lead to a lot of
# issues.
return [] return []
self._get_insertion_node(tree_nodes[0]) self._get_insertion_node(tree_nodes[0])
@@ -622,10 +628,6 @@ class _NodesTree(object):
new_nodes.append(node) new_nodes.append(node)
while new_nodes and new_nodes[0].type == 'error_leaf' \
and new_nodes[0].token_type in _INDENTATION_TOKENS:
new_nodes.pop(0)
if not new_nodes: if not new_nodes:
return [], working_stack, prefix return [], working_stack, prefix

28
test/test_diff_parser.py
View File

@@ -205,7 +205,7 @@ def test_open_parentheses(differ):
differ.parse(new_code, parsers=1, expect_error_leaves=True) differ.parse(new_code, parsers=1, expect_error_leaves=True)
new_code = 'a = 1\n' + new_code new_code = 'a = 1\n' + new_code
differ.parse(new_code, copies=1, parsers=1, expect_error_leaves=True) differ.parse(new_code, parsers=2, expect_error_leaves=True)
func += 'def other_func():\n pass\n' func += 'def other_func():\n pass\n'
differ.initialize('isinstance(\n' + func) differ.initialize('isinstance(\n' + func)
@@ -502,7 +502,7 @@ def test_endmarker_newline(differ):
code2 = code1.replace('codet', 'coded') code2 = code1.replace('codet', 'coded')
differ.initialize(code1) differ.initialize(code1)
differ.parse(code2, parsers=1, copies=2, expect_error_leaves=True) differ.parse(code2, parsers=2, copies=1, expect_error_leaves=True)
def test_newlines_at_end(differ): def test_newlines_at_end(differ):
@@ -1099,7 +1099,7 @@ def test_all_sorts_of_indentation(differ):
end end
''') ''')
differ.initialize(code1) differ.initialize(code1)
differ.parse(code2, copies=2, parsers=3, expect_error_leaves=True) differ.parse(code2, copies=1, parsers=4, expect_error_leaves=True)
differ.parse(code1, copies=1, parsers=3) differ.parse(code1, copies=1, parsers=3)
code3 = dedent('''\ code3 = dedent('''\
@@ -1127,4 +1127,24 @@ def test_dont_copy_dedents_in_beginning(differ):
''') ''')
differ.initialize(code1) differ.initialize(code1)
differ.parse(code2, copies=1, parsers=1, expect_error_leaves=True) differ.parse(code2, copies=1, parsers=1, expect_error_leaves=True)
differ.parse(code1, copies=1, parsers=1) differ.parse(code1, parsers=2)
def test_dont_copy_error_leaves(differ):
code1 = dedent('''\
def f(n):
x
if 2:
3
''')
code2 = dedent('''\
def f(n):
def if 1:
indent
x
if 2:
3
''')
differ.initialize(code1)
differ.parse(code2, parsers=1, expect_error_leaves=True)
differ.parse(code1, parsers=2)