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

Fix an issue in the diff parser.

Browse Source
This commit is contained in:
Dave Halter
2016-12-20 23:32:51 +01:00
parent 68fabc3048
commit 90b76ee3ec
4 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jedi/parser/fast.py
View File

@@ -44,7 +44,7 @@ def _merge_used_names(base_dict, other_dict):
def _get_last_line(node_or_leaf):
last_leaf = node_or_leaf.last_leaf()
if last_leaf.type == 'error_leaf':
typ = tok_name[last_leaf.original_type].lower()
typ = last_leaf.original_type
else:
typ = last_leaf.type
if typ == 'newline':
@@ -86,6 +86,17 @@ def _is_flow_node(node):
return value in ('if', 'for', 'while', 'try')
def _last_leaf_is_newline(last_leaf):
if last_leaf.prefix.endswith('\n'):
return True
if last_leaf.prefix:
return False
previous_leaf = last_leaf.get_previous_leaf()
return (previous_leaf.type == 'newline' or
previous_leaf.type == 'error_leaf' and
previous_leaf.original_type == 'newline')
class DiffParser(object):
endmarker_type = 'endmarker'
@@ -269,8 +280,7 @@ class DiffParser(object):
is_endmarker = last_leaf.type == self.endmarker_type
if is_endmarker:
self._parsed_until_line = last_leaf.start_pos[0]
if last_leaf.prefix.endswith('\n') or \
not last_leaf.prefix and last_leaf.get_previous_leaf().type == 'newline':
if _last_leaf_is_newline(last_leaf):
self._parsed_until_line -= 1
else:
if last_leaf.type == 'newline':