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

Fix an issue where indents where repeated unnessecarily

Browse Source
This commit is contained in:
Dave Halter
2020-03-24 00:24:53 +01:00
parent 8e95820d78
commit 2bef3cf6ff
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
parso/python/diff.py
View File

@@ -503,6 +503,11 @@ class _NodesTreeNode(object):
return max(line, self._node_children[-1].get_last_line(suffix)) return max(line, self._node_children[-1].get_last_line(suffix))
return line return line
def get_latest_indentation(self):
if not self._children_groups:
return 0
return self._children_groups[-1].children[0].start_pos[1]
class _NodesTree(object): class _NodesTree(object):
def __init__(self, module): def __init__(self, module):
@@ -543,11 +548,12 @@ class _NodesTree(object):
break break
elif tree_node.type == 'file_input': elif tree_node.type == 'file_input':
if indentation > 0: if indentation > 0:
if previous_node is not None: if previous_node is None:
if indentation != node.get_latest_indentation():
add_error_leaf = 'INDENT'
else:
node = previous_node node = previous_node
add_error_leaf = 'ERROR_DEDENT' add_error_leaf = 'ERROR_DEDENT'
else:
add_error_leaf = 'INDENT'
break break
previous_node = node previous_node = node

4
test/test_diff_parser.py
View File

@@ -284,10 +284,10 @@ def test_wrong_whitespace(differ):
hello hello
''' '''
differ.initialize(code) differ.initialize(code)
differ.parse(code + 'bar\n ', parsers=3) differ.parse(code + 'bar\n ', parsers=3, expect_error_leaves=True)
code += """abc(\npass\n """ code += """abc(\npass\n """
differ.parse(code, parsers=2, copies=1, expect_error_leaves=True) differ.parse(code, parsers=3, expect_error_leaves=True)
def test_issues_with_error_leaves(differ): def test_issues_with_error_leaves(differ):