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

Remove copied nodes stuff, to simplify some things

Browse Source
This commit is contained in:
Dave Halter
2019-01-13 19:57:23 +01:00
parent a7e24a37e7
commit ea8a758051
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
parso/python/diff.py
View File

@@ -258,8 +258,6 @@ class DiffParser(object):
LOG.warning('parser issue:\n%s\n%s', ''.join(old_lines), ''.join(lines_new)) LOG.warning('parser issue:\n%s\n%s', ''.join(old_lines), ''.join(lines_new))
def _copy_from_old_parser(self, line_offset, until_line_old, until_line_new): def _copy_from_old_parser(self, line_offset, until_line_old, until_line_new):
copied_nodes = [None]
last_until_line = -1 last_until_line = -1
while until_line_new > self._nodes_tree.parsed_until_line: while until_line_new > self._nodes_tree.parsed_until_line:
parsed_until_line_old = self._nodes_tree.parsed_until_line - line_offset parsed_until_line_old = self._nodes_tree.parsed_until_line - line_offset
@@ -269,11 +267,6 @@ class DiffParser(object):
# want to get into a state where the old parser has statements # want to get into a state where the old parser has statements
# again that can be copied (e.g. not lines within parentheses). # again that can be copied (e.g. not lines within parentheses).
self._parse(self._nodes_tree.parsed_until_line + 1) self._parse(self._nodes_tree.parsed_until_line + 1)
elif not copied_nodes:
# We have copied as much as possible (but definitely not too
# much). Therefore we just parse a bit more.
self._parse(self._nodes_tree.parsed_until_line + 1)
copied_nodes = [None]
else: else:
p_children = line_stmt.parent.children p_children = line_stmt.parent.children
index = p_children.index(line_stmt) index = p_children.index(line_stmt)
@@ -293,10 +286,13 @@ class DiffParser(object):
LOG.debug('copy old[%s:%s] new[%s:%s]', LOG.debug('copy old[%s:%s] new[%s:%s]',
copied_nodes[0].start_pos[0], copied_nodes[0].start_pos[0],
copied_nodes[-1].end_pos[0] - 1, from_, to) copied_nodes[-1].end_pos[0] - 1, from_, to)
else:
# We have copied as much as possible (but definitely not too
# much). Therefore we just parse a bit more.
self._parse(self._nodes_tree.parsed_until_line + 1)
# Since there are potential bugs that might loop here endlessly, we # Since there are potential bugs that might loop here endlessly, we
# just stop here. # just stop here.
assert last_until_line != self._nodes_tree.parsed_until_line \ assert last_until_line != self._nodes_tree.parsed_until_line, last_until_line
or not copied_nodes, last_until_line
last_until_line = self._nodes_tree.parsed_until_line last_until_line = self._nodes_tree.parsed_until_line
def _get_old_line_stmt(self, old_line): def _get_old_line_stmt(self, old_line):