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

Diff parser: Make sure that nested suites get properly copied

Browse Source
This commit is contained in:
Dave Halter
2020-04-05 02:47:34 +02:00
parent ebc69545c7
commit ed38518052
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
parso/python/diff.py
View File

@@ -615,15 +615,22 @@ class _NodesTree(object):
tree_nodes = tree_nodes[:-1] tree_nodes = tree_nodes[:-1]
return tree_nodes return tree_nodes
def _get_matching_indent_nodes(self, tree_nodes): def _get_matching_indent_nodes(self, tree_nodes, is_new_suite):
# There might be a random dedent where we have to stop copying. # There might be a random dedent where we have to stop copying.
# Invalid indents are ok, because the parser handled that # Invalid indents are ok, because the parser handled that
# properly before. An invalid dedent can happen, because a few # properly before. An invalid dedent can happen, because a few
# lines above there was an invalid indent. # lines above there was an invalid indent.
indent = _get_indentation(tree_nodes[0]) node_iterator = iter(tree_nodes)
if indent not in self.indents: if is_new_suite:
yield next(node_iterator)
first_node = next(node_iterator)
indent = _get_indentation(first_node)
if not is_new_suite and indent not in self.indents:
return return
for n in tree_nodes: yield first_node
for n in node_iterator:
if _get_indentation(n) != indent: if _get_indentation(n) != indent:
return return
yield n yield n
@@ -645,8 +652,6 @@ class _NodesTree(object):
old_indents = self.indents old_indents = self.indents
self.indents = [i for i in self.indents if i <= indentation] self.indents = [i for i in self.indents if i <= indentation]
tree_nodes = list(self._get_matching_indent_nodes(tree_nodes))
self._update_insertion_node(indentation) self._update_insertion_node(indentation)
new_nodes, self._working_stack, self.prefix, added_indents = self._copy_nodes( new_nodes, self._working_stack, self.prefix, added_indents = self._copy_nodes(
@@ -665,10 +670,15 @@ class _NodesTree(object):
return new_nodes return new_nodes
def _copy_nodes(self, working_stack, nodes, until_line, line_offset, def _copy_nodes(self, working_stack, nodes, until_line, line_offset,
prefix=''): prefix='', is_nested=False):
new_nodes = [] new_nodes = []
added_indents = [] added_indents = []
nodes = list(self._get_matching_indent_nodes(
nodes,
is_new_suite=is_nested,
))
new_prefix = '' new_prefix = ''
for node in nodes: for node in nodes:
if node.start_pos[0] > until_line: if node.start_pos[0] > until_line:
@@ -738,7 +748,8 @@ class _NodesTree(object):
# 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, new_prefix, ai = self._copy_nodes( suite_nodes, new_working_stack, new_prefix, ai = self._copy_nodes(
working_stack + [suite_tos], suite.children, until_line, line_offset working_stack + [suite_tos], suite.children, until_line, line_offset,
is_nested=True,
) )
added_indents += ai added_indents += ai
if len(suite_nodes) < 2: if len(suite_nodes) < 2:

17
test/test_diff_parser.py
View File

@@ -1524,3 +1524,20 @@ def test_weird_ending(differ):
y"""''') y"""''')
differ.initialize(code1) differ.initialize(code1)
differ.parse(code2, parsers=1, copies=1, expect_error_leaves=True) differ.parse(code2, parsers=1, copies=1, expect_error_leaves=True)
def test_nested_class(differ):
code1 = dedent('''\
def c():
a = 3
class X:
b
''')
code2 = dedent('''\
def c():
a = 3
class X:
elif
''')
differ.initialize(code1)
differ.parse(code2, parsers=1, copies=1, expect_error_leaves=True)