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: Skip last leaves for last line offset leaves

Browse Source
This commit is contained in:
Dave Halter
2019-01-17 00:15:01 +01:00
parent dac4c445a7
commit e591b929eb
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
parso/python/diff.py
View File

@@ -466,6 +466,10 @@ class _NodesTreeNode(object):
if self._children_groups: if self._children_groups:
children_group = self._children_groups[-1] children_group = self._children_groups[-1]
last_leaf = children_group.last_line_offset_leaf last_leaf = children_group.last_line_offset_leaf
while last_leaf.type == 'error_leaf' \
and last_leaf.token_type in _INDENTATION_TOKENS:
last_leaf = last_leaf.get_previous_leaf()
line = last_leaf.end_pos[0] + children_group.line_offset line = last_leaf.end_pos[0] + children_group.line_offset
# Newlines end on the next line, which means that they would cover # Newlines end on the next line, which means that they would cover

11
test/test_diff_parser.py
View File

@@ -1097,3 +1097,14 @@ def test_all_sorts_of_indentation(differ):
differ.initialize(code1) differ.initialize(code1)
differ.parse(code2, copies=2, parsers=3, expect_error_leaves=True) differ.parse(code2, copies=2, parsers=3, expect_error_leaves=True)
differ.parse(code1, copies=1, parsers=3) differ.parse(code1, copies=1, parsers=3)
code3 = dedent('''\
if 1:
a
b
c
d
\x00
''')
differ.parse(code3, parsers=2, expect_error_leaves=True)
differ.parse('')