VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Some passing tests for the new diff parser (the old fast parser tests).

Browse Source
This commit is contained in:
Dave Halter
2016-09-05 00:42:41 +02:00
parent 00a8b3e4f1
commit f353c79528
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/parser/fast.py
+6 -4
View File
@@ -115,7 +115,7 @@ class DiffParser():
if operation == 'equal': if operation == 'equal':
line_offset = j1 - i1 line_offset = j1 - i1
self._copy_from_old_parser(line_offset, i2 + 1, j2) self._copy_from_old_parser(line_offset, i2, j2)
elif operation == 'replace': elif operation == 'replace':
self._delete_count += 1 self._delete_count += 1
self._insert(j2) self._insert(j2)
@@ -149,11 +149,13 @@ class DiffParser():
# statements again (not e.g. lines within parentheses). # statements again (not e.g. lines within parentheses).
self._parse(self._parsed_until_line + 1) self._parse(self._parsed_until_line + 1)
else: else:
print('copy', line_stmt.end_pos, parsed_until_line_old,
until_line_old, line_stmt)
p_children = line_stmt.parent.children p_children = line_stmt.parent.children
index = p_children.index(line_stmt) index = p_children.index(line_stmt)
nodes = [] nodes = []
for node in p_children[index:]: for node in p_children[index:]:
if until_line_old < node.end_pos[0]: if node.end_pos[0] > until_line_old:
divided_node = self._divide_node(node, until_line_new) divided_node = self._divide_node(node, until_line_new)
if divided_node is not None: if divided_node is not None:
nodes.append(divided_node) nodes.append(divided_node)
@@ -220,7 +222,6 @@ class DiffParser():
self._parsed_until_line = last_leaf.end_pos[0] self._parsed_until_line = last_leaf.end_pos[0]
print('parsed_until', last_leaf.end_pos, self._parsed_until_line) print('parsed_until', last_leaf.end_pos, self._parsed_until_line)
print('x', repr(self._prefix))
first_leaf = nodes[0].first_leaf() first_leaf = nodes[0].first_leaf()
first_leaf.prefix = self._prefix + first_leaf.prefix first_leaf.prefix = self._prefix + first_leaf.prefix
self._prefix = '' self._prefix = ''
@@ -389,7 +390,7 @@ class DiffParser():
# TODO speed up, shouldn't copy the whole list all the time. # TODO speed up, shouldn't copy the whole list all the time.
# memoryview? # memoryview?
lines_after = self._lines_new[self._parsed_until_line:] lines_after = self._lines_new[self._parsed_until_line:]
print('x', self._parsed_until_line, lines_after, until_line) print('parse_content', self._parsed_until_line, lines_after, until_line)
tokenizer = self._diff_tokenize( tokenizer = self._diff_tokenize(
lines_after, lines_after,
until_line, until_line,
@@ -446,6 +447,7 @@ class DiffParser():
if omitted_first_indent and not indents: if omitted_first_indent and not indents:
# We are done here, only thing that can come now is an # We are done here, only thing that can come now is an
# endmarker or another dedented code block. # endmarker or another dedented code block.
yield tokenize.TokenInfo(tokenize.ENDMARKER, '', start_pos, '')
break break
elif typ == tokenize.NEWLINE and start_pos[0] >= until_line: elif typ == tokenize.NEWLINE and start_pos[0] >= until_line:
yield tokenize.TokenInfo(typ, string, start_pos, prefix) yield tokenize.TokenInfo(typ, string, start_pos, prefix)