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

Fix diff parser: Avoid side effects for prefix

Browse Source
This commit is contained in:
Dave Halter
2019-01-14 21:36:10 +01:00
parent 9cc8178998
commit 20fd32b45d
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
parso/python/diff.py
View File

@@ -572,7 +572,7 @@ class _NodesTree(object):
self._get_insertion_node(tree_nodes[0]) self._get_insertion_node(tree_nodes[0])
new_nodes, self._working_stack = self._copy_nodes( new_nodes, self._working_stack, self.prefix = self._copy_nodes(
list(self._working_stack), list(self._working_stack),
tree_nodes, tree_nodes,
until_line, until_line,
@@ -611,7 +611,7 @@ class _NodesTree(object):
new_nodes.append(node) new_nodes.append(node)
if not new_nodes: if not new_nodes:
return [], working_stack return [], working_stack, prefix
tos = working_stack[-1] tos = working_stack[-1]
last_node = new_nodes[-1] last_node = new_nodes[-1]
@@ -624,7 +624,7 @@ class _NodesTree(object):
suite_tos = _NodesTreeNode(suite) suite_tos = _NodesTreeNode(suite)
# Don't need to pass line_offset here, it's already done by the # Don't need to pass line_offset here, it's already done by the
# parent. # parent.
suite_nodes, new_working_stack = self._copy_nodes( suite_nodes, new_working_stack, new_prefix = self._copy_nodes(
working_stack + [suite_tos], suite.children, until_line, line_offset working_stack + [suite_tos], suite.children, until_line, line_offset
) )
if len(suite_nodes) < 2: if len(suite_nodes) < 2:
@@ -666,14 +666,10 @@ class _NodesTree(object):
else: else:
last_line_offset_leaf = new_nodes[-1].get_last_leaf() last_line_offset_leaf = new_nodes[-1].get_last_leaf()
tos.add_tree_nodes(prefix, new_nodes, line_offset, last_line_offset_leaf) tos.add_tree_nodes(prefix, new_nodes, line_offset, last_line_offset_leaf)
self.prefix = new_prefix prefix = new_prefix
self._prefix_remainder = '' self._prefix_remainder = ''
else:
# Need to reset the prefix, because it might have been reset higher
# up in the stack.
self.prefix = prefix
return new_nodes, working_stack return new_nodes, working_stack, prefix
def close(self): def close(self):
self._base_node.finish() self._base_node.finish()

17
test/test_diff_parser.py
View File

@@ -1052,3 +1052,20 @@ def test_import_opening_bracket(differ):
differ.initialize(code1) differ.initialize(code1)
differ.parse(code2, copies=1, parsers=2, expect_error_leaves=True) differ.parse(code2, copies=1, parsers=2, expect_error_leaves=True)
differ.parse(code1, copies=1, parsers=2, expect_error_leaves=True) differ.parse(code1, copies=1, parsers=2, expect_error_leaves=True)
def test_opening_bracket_at_end(differ):
code1 = dedent('''\
class C:
1
[
''')
code2 = dedent('''\
3
class C:
1
[
''')
differ.initialize(code1)
differ.parse(code2, copies=1, parsers=2, expect_error_leaves=True)
differ.parse(code1, copies=1, parsers=1, expect_error_leaves=True)