VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2026-05-25 09:48:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Diff parser: Fix a few more indentation issues

Browse Source
This commit is contained in:
Dave Halter
2020-03-24 22:03:29 +01:00
parent 2bef3cf6ff
commit 419d9e3174
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parso/python/diff.py
+5 -3
View File
@@ -547,10 +547,9 @@ class _NodesTree(object):
# having the right indentation. # having the right indentation.
break break
elif tree_node.type == 'file_input': elif tree_node.type == 'file_input':
if indentation > 0: if indentation > 0 and indentation != node.get_latest_indentation():
if previous_node is None: if previous_node is None:
if indentation != node.get_latest_indentation(): add_error_leaf = 'INDENT'
add_error_leaf = 'INDENT'
else: else:
node = previous_node node = previous_node
add_error_leaf = 'ERROR_DEDENT' add_error_leaf = 'ERROR_DEDENT'
@@ -633,6 +632,7 @@ class _NodesTree(object):
if c.start_pos[1] < indentation: if c.start_pos[1] < indentation:
tree_nodes = tree_nodes[:i] tree_nodes = tree_nodes[:i]
old_working_stack = list(self._working_stack)
add_error_leaf, _ = self._get_insertion_node(tree_nodes[0]) add_error_leaf, _ = self._get_insertion_node(tree_nodes[0])
new_nodes, self._working_stack, self.prefix = self._copy_nodes( new_nodes, self._working_stack, self.prefix = self._copy_nodes(
@@ -643,6 +643,8 @@ class _NodesTree(object):
self.prefix, self.prefix,
add_error_leaf=add_error_leaf, add_error_leaf=add_error_leaf,
) )
if not new_nodes:
self._working_stack = old_working_stack
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,