VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-09 23:34:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed other part of jedi-vim issue 8, 'import x as' caused parsing error

Browse Source
This commit is contained in:
David Halter
2012-10-16 12:08:41 +02:00
parent 77e48fcd95
commit 211ad9a640
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jedi/parsing.py
View File

@@ -1191,13 +1191,13 @@ class PyFuzzyParser(object):
if pre_used_token is None: if pre_used_token is None:
token_type, tok = self.next() token_type, tok = self.next()
if token_type != tokenize.NAME and tok != '*': if token_type != tokenize.NAME and tok != '*':
return ([], token_type, tok, self.start_pos) return [], token_type, tok
else: else:
token_type, tok = pre_used_token token_type, tok = pre_used_token
if token_type != tokenize.NAME and tok != '*': if token_type != tokenize.NAME and tok != '*':
# token maybe a name or star # token maybe a name or star
return (None, token_type, tok) return None, token_type, tok
append((tok, self.start_pos)) append((tok, self.start_pos))
first_pos = self.start_pos first_pos = self.start_pos
@@ -1211,7 +1211,7 @@ class PyFuzzyParser(object):
append((tok, self.start_pos)) append((tok, self.start_pos))
n = Name(names, first_pos, self.end_pos) if names else None n = Name(names, first_pos, self.end_pos) if names else None
return (n, token_type, tok) return n, token_type, tok
def _parseimportlist(self): def _parseimportlist(self):
""" """

2
test/completion/invalid.py
View File

@@ -112,3 +112,5 @@ def asdf(a or b): # multiple param names
#? int() #? int()
asdf(2) asdf(2)
import datetime as