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

Fixed all on_import tests.

Browse Source
This commit is contained in:
Dave Halter
2016-05-29 12:08:53 +02:00
parent 2700c2cca4
commit feef45f4bb
5 changed files with 113 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jedi/parser/__init__.py
View File

@@ -59,6 +59,8 @@ def load_grammar(version='3.4'):
class ErrorStatement(object):
type = 'error_stmt'
def __init__(self, stack, arcs, next_token, position_modifier, next_start_pos):
self.stack = stack
self.arcs = arcs
@@ -104,15 +106,6 @@ class ErrorStatement(object):
first = next(iterator)
return first.get_code(include_prefix=include_prefix) + ''.join(node.get_code() for node in iterator)
def get_next_leaf(self):
for child in self.parent.children:
if child.start_pos == self.end_pos:
return child.first_leaf()
if child.start_pos > self.end_pos:
raise NotImplementedError('Node not found, must be in error statements.')
raise ValueError("Doesn't have a next leaf")
def set_parent(self, root_node):
"""
Used by the parser at the end of parsing. The error statements parents
@@ -313,14 +306,14 @@ class Parser(object):
endmarker._start_pos = endmarker._start_pos[0] - 1, len(last_line)
else:
try:
newline = endmarker.get_previous()
newline = endmarker.get_previous_leaf()
except IndexError:
return # This means that the parser is empty.
while True:
if newline.value == '':
# Must be a DEDENT, just continue.
try:
newline = newline.get_previous()
newline = newline.get_previous_leaf()
except IndexError:
# If there's a statement that fails to be parsed, there
# will be no previous leaf. So just ignore it.