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

Call should always have an end_pos

Browse Source
This commit is contained in:
David Halter
2013-08-16 22:15:02 +04:30
parent 3d698ffad6
commit d4ff98aee2
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/evaluate.py
View File

@@ -477,7 +477,7 @@ def check_getattr(inst, name_str):
result = [] result = []
# str is important to lose the NamePart! # str is important to lose the NamePart!
module = builtin.Builtin.scope module = builtin.Builtin.scope
name = pr.Call(module, str(name_str), pr.Call.STRING, (0, 0), inst) name = pr.Call(module, str(name_str), pr.Call.STRING, (0, 0), (0, 0), inst)
with common.ignored(KeyError): with common.ignored(KeyError):
result = inst.execute_subscope_by_name('__getattr__', [name]) result = inst.execute_subscope_by_name('__getattr__', [name])
if not result: if not result:

20
jedi/parsing_representation.py
View File

@@ -911,7 +911,7 @@ class Statement(Simple):
level = 1 level = 1
tok = None tok = None
first = True first = True
end_pos = None end_pos = None, None
for i, tok_temp in token_iterator: for i, tok_temp in token_iterator:
if isinstance(tok_temp, Base): if isinstance(tok_temp, Base):
# the token is a Name, which has already been parsed # the token is a Name, which has already been parsed
@@ -1042,8 +1042,10 @@ class Statement(Simple):
tok = tok_temp tok = tok_temp
token_type = None token_type = None
start_pos = tok.start_pos start_pos = tok.start_pos
end_pos = tok.end_pos
else: else:
token_type, tok, start_pos = tok_temp token_type, tok, start_pos = tok_temp
end_pos = start_pos[0], start_pos[1] + len(tok)
if is_assignment(tok): if is_assignment(tok):
# This means, there is an assignment here. # This means, there is an assignment here.
# Add assignments, which can be more than one # Add assignments, which can be more than one
@@ -1072,7 +1074,7 @@ class Statement(Simple):
elif token_type == tokenize.NUMBER: elif token_type == tokenize.NUMBER:
c_type = Call.NUMBER c_type = Call.NUMBER
call = Call(self._sub_module, tok, c_type, start_pos, self) call = Call(self._sub_module, tok, c_type, start_pos, end_pos, self)
if is_chain: if is_chain:
result[-1].set_next(call) result[-1].set_next(call)
else: else:
@@ -1100,13 +1102,13 @@ class Statement(Simple):
token_iterator.push_back((i, tok)) token_iterator.push_back((i, tok))
t = self.token_list[i - 1] t = self.token_list[i - 1]
try: try:
end_pos = t.end_pos e = t.end_pos
except AttributeError: except AttributeError:
end_pos = (t[2][0], t[2][1] + len(t[1])) \ e = (t[2][0], t[2][1] + len(t[1])) \
if isinstance(t, tuple) else t.start_pos if isinstance(t, tuple) else t.start_pos
stmt = Statement(self._sub_module, [], [], result, stmt = Statement(self._sub_module, [], [], result,
start_pos, end_pos, self.parent) start_pos, e, self.parent)
stmt._commands = result stmt._commands = result
arr, break_tok = parse_array(token_iterator, Array.TUPLE, arr, break_tok = parse_array(token_iterator, Array.TUPLE,
stmt.start_pos, stmt) stmt.start_pos, stmt)
@@ -1162,8 +1164,8 @@ class Call(Simple):
NUMBER = 2 NUMBER = 2
STRING = 3 STRING = 3
def __init__(self, module, name, type, start_pos, parent=None): def __init__(self, module, name, type, start_pos, end_pos, parent=None):
super(Call, self).__init__(module, start_pos) super(Call, self).__init__(module, start_pos, end_pos)
self.name = name self.name = name
# parent is not the oposite of next. The parent of c: a = [b.c] would # parent is not the oposite of next. The parent of c: a = [b.c] would
# be an array. # be an array.
@@ -1242,10 +1244,10 @@ class Array(Call):
SET = 'set' SET = 'set'
def __init__(self, module, start_pos, arr_type=NOARRAY, parent=None): def __init__(self, module, start_pos, arr_type=NOARRAY, parent=None):
super(Array, self).__init__(module, None, arr_type, start_pos, parent) super(Array, self).__init__(module, None, arr_type, start_pos, (None, None), parent)
self.end_pos = None, None
self.values = [] self.values = []
self.keys = [] self.keys = []
self.end_pos = None, None
def add_statement(self, statement, is_key=False): def add_statement(self, statement, is_key=False):
"""Just add a new statement""" """Just add a new statement"""