mirror of
https://github.com/davidhalter/parso.git
synced 2026-11-12 04:10:29 +08:00
Fix diff parser: If funcs are not copied, errors shouldn't either
This commit is contained in:
1 parent
26aee1c6a9
commit
65b15b05e3
2 files changed
+35
-1
No files matched your search
@@ -638,7 +638,9 @@ class _NodesTree(object):
|
||||
working_stack = new_working_stack
|
||||
had_valid_suite_last = True
|
||||
|
||||
elif (last_node.type in ('error_leaf', 'error_node') or
|
||||
if new_nodes:
|
||||
last_node = new_nodes[-1]
|
||||
if (last_node.type in ('error_leaf', 'error_node') or
|
||||
_is_flow_node(new_nodes[-1])):
|
||||
# Error leafs/nodes don't have a defined start/end. Error
|
||||
# nodes might not end with a newline (e.g. if there's an
|
||||
|
||||
@@ -852,3 +852,35 @@ def test_error_dedent_issues(differ):
|
||||
differ.initialize(code1)
|
||||
differ.parse(code2, parsers=5, copies=1, expect_error_leaves=True)
|
||||
differ.parse(code1, parsers=1, copies=0)
|
||||
|
||||
|
||||
def test_random_text_insertion(differ):
|
||||
code1 = dedent('''\
|
||||
class C:
|
||||
def f():
|
||||
return node
|
||||
|
||||
def g():
|
||||
try:
|
||||
1
|
||||
except KeyError:
|
||||
2
|
||||
''')
|
||||
|
||||
code2 = dedent('''\
|
||||
class C:
|
||||
def f():
|
||||
return node
|
||||
Some'random text: yeah
|
||||
for push in plan.dfa_pushes:
|
||||
|
||||
def g():
|
||||
try:
|
||||
1
|
||||
except KeyError:
|
||||
2
|
||||
''')
|
||||
|
||||
differ.initialize(code1)
|
||||
differ.parse(code2, parsers=1, copies=1, expect_error_leaves=True)
|
||||
differ.parse(code1, parsers=1, copies=1)
|
||||
Reference in new issue
Block a user