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

Fix an issue in the diff parser about endmarker newlines

Browse Source 
This was discovered in https://github.com/davidhalter/jedi/issues/1000.
This commit is contained in:
Dave Halter
2018-03-11 23:41:18 +01:00
parent f89809de9a
commit 065da34272
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
parso/python/diff.py
View File

@@ -133,7 +133,7 @@ class DiffParser(object):
LOG.debug('diff: line_lengths old: %s, new: %s' % (len(old_lines), line_length)) LOG.debug('diff: line_lengths old: %s, new: %s' % (len(old_lines), line_length))
for operation, i1, i2, j1, j2 in opcodes: for operation, i1, i2, j1, j2 in opcodes:
LOG.debug('diff %s old[%s:%s] new[%s:%s]', LOG.debug('diff code[%s] old[%s:%s] new[%s:%s]',
operation, i1 + 1, i2, j1 + 1, j2) operation, i1 + 1, i2, j1 + 1, j2)
if j2 == line_length and new_lines[-1] == '': if j2 == line_length and new_lines[-1] == '':
@@ -454,7 +454,7 @@ class _NodesStack(object):
self._last_prefix = '' self._last_prefix = ''
if is_endmarker: if is_endmarker:
try: try:
separation = last_leaf.prefix.rindex('\n') separation = last_leaf.prefix.rindex('\n') + 1
except ValueError: except ValueError:
pass pass
else: else:
@@ -462,7 +462,7 @@ class _NodesStack(object):
# That is not relevant if parentheses were opened. Always parse # That is not relevant if parentheses were opened. Always parse
# until the end of a line. # until the end of a line.
last_leaf.prefix, self._last_prefix = \ last_leaf.prefix, self._last_prefix = \
last_leaf.prefix[:separation + 1], last_leaf.prefix[separation + 1:] last_leaf.prefix[:separation], last_leaf.prefix[separation:]
first_leaf = tree_nodes[0].get_first_leaf() first_leaf = tree_nodes[0].get_first_leaf()
first_leaf.prefix = self.prefix + first_leaf.prefix first_leaf.prefix = self.prefix + first_leaf.prefix
@@ -472,7 +472,6 @@ class _NodesStack(object):
self.prefix = last_leaf.prefix self.prefix = last_leaf.prefix
tree_nodes = tree_nodes[:-1] tree_nodes = tree_nodes[:-1]
return tree_nodes return tree_nodes
def copy_nodes(self, tree_nodes, until_line, line_offset): def copy_nodes(self, tree_nodes, until_line, line_offset):
@@ -492,6 +491,13 @@ class _NodesStack(object):
new_tos = tos new_tos = tos
for node in nodes: for node in nodes:
if node.type == 'endmarker': 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.
try:
self.prefix = node.prefix[:node.prefix.rindex('\n') + 1]
except ValueError:
pass
# Endmarkers just distort all the checks below. Remove them. # Endmarkers just distort all the checks below. Remove them.
break break

18
test/test_diff_parser.py
View File

@@ -484,3 +484,21 @@ def test_indentation_issue(differ):
differ.initialize(code1) differ.initialize(code1)
differ.parse(code2, parsers=2) differ.parse(code2, parsers=2)
def test_endmarker_newline(differ):
code1 = dedent('''\
docu = None
# some comment
result = codet
incomplete_dctassign = {
"module"
if "a":
x = 3 # asdf
''')
code2 = code1.replace('codet', 'coded')
differ.initialize(code1)
differ.parse(code2, parsers=2, copies=2, expect_error_leaves=True)