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

Fix diff parser: issue with opening brackets

Browse Source
This commit is contained in:
Dave Halter
2019-01-20 00:27:44 +01:00
parent 3d890c3a00
commit 0da0a8655a
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
parso/python/diff.py
View File

@@ -608,13 +608,6 @@ class _NodesTree(object):
break
if node.type == 'endmarker':
# We basically removed the endmarker, but we are not allowed to
# remove the newline at the end of the line, otherwise it's
# going to be missing.
newline_index = max(node.prefix.rfind('\n'), node.prefix.rfind('\r'))
if newline_index > -1:
new_prefix = node.prefix[:newline_index + 1]
# Endmarkers just distort all the checks below. Remove them.
break
if node.type == 'error_leaf' and node.token_type in ('DEDENT', 'ERROR_DEDENT'):
@@ -677,6 +670,16 @@ class _NodesTree(object):
new_nodes.pop()
if new_nodes:
if not _ends_with_newline(new_nodes[-1].get_last_leaf()) and not had_valid_suite_last:
p = new_nodes[-1].get_next_leaf().prefix
# We are not allowed to remove the newline at the end of the
# line, otherwise it's going to be missing. This happens e.g.
# if a bracket is around before that moves newlines to
# prefixes.
newline_index = max(p.rfind('\n'), p.rfind('\r'))
if newline_index > -1:
new_prefix = p[:newline_index + 1]
if had_valid_suite_last:
last = new_nodes[-1]
if last.type == 'decorated':