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

fix long standing issue with import end_pos

Browse Source
This commit is contained in:
Dave Halter
2014-02-26 11:03:19 +01:00
parent b28f8fc7b4
commit 8d1a9f2d46
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/parser/__init__.py
+6 -18
View File
@@ -439,13 +439,8 @@ class Parser(object):
elif tok_str == 'import': elif tok_str == 'import':
imports = self._parse_import_list() imports = self._parse_import_list()
for count, (m, alias, defunct) in enumerate(imports): for count, (m, alias, defunct) in enumerate(imports):
if alias or m: e = (alias or m or self._gen.previous).end_pos
#e = (alias or m or self).end_pos end_pos = self._gen.previous.end_pos if count + 1 == len(imports) else e
e = (alias or m).end_pos
else:
# TODO cleanup like e = (alias or name or self._gen.current).end_pos
e = self._gen.current.end_pos
end_pos = self._gen.current.end_pos if count + 1 == len(imports) else e
i = pr.Import(self.module, first_pos, end_pos, m, i = pr.Import(self.module, first_pos, end_pos, m,
alias, defunct=defunct) alias, defunct=defunct)
self._check_user_stmt(i) self._check_user_stmt(i)
@@ -481,12 +476,8 @@ class Parser(object):
star = name is not None and name.names[0] == '*' star = name is not None and name.names[0] == '*'
if star: if star:
name = None name = None
if alias or name: e = (alias or name or self._gen.previous).end_pos
e = (alias or name).end_pos end_pos = self._gen.previous.end_pos if count + 1 == len(names) else e
else:
# TODO cleanup like e = (alias or name or self._gen.current).end_pos
e = self._gen.current.end_pos
end_pos = self._gen.current.end_pos if count + 1 == len(names) else e
i = pr.Import(self.module, first_pos, end_pos, name, i = pr.Import(self.module, first_pos, end_pos, name,
alias, mod, star, relative_count, alias, mod, star, relative_count,
defunct=defunct or defunct2) defunct=defunct or defunct2)
@@ -609,7 +600,7 @@ class PushBackTokenizer(object):
def __init__(self, tokenizer): def __init__(self, tokenizer):
self._tokenizer = tokenizer self._tokenizer = tokenizer
self._push_backs = [] self._push_backs = []
self.current = tokenize.Token(None, '', (0, 0)) self.current = self.previous = tokenize.Token(None, '', (0, 0))
def push_last_back(self): def push_last_back(self):
self._push_backs.append(self.current) self._push_backs.append(self.current)
@@ -622,12 +613,9 @@ class PushBackTokenizer(object):
if self._push_backs: if self._push_backs:
return self._push_backs.pop(0) return self._push_backs.pop(0)
self.previous = self.current
self.current = next(self._tokenizer) self.current = next(self._tokenizer)
return self.current return self.current
def __iter__(self): def __iter__(self):
return self return self
@property
def previous(self):
return self._tokenizer.previous