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

Ellipsis comparisons are working now. Ellipsis was previously ignored.

Browse Source
This commit is contained in:
Dave Halter
2016-01-07 10:41:34 +01:00
parent 4e93fb344b
commit 43ad4cfeb8
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/evaluate/__init__.py
View File

@@ -312,7 +312,8 @@ class Evaluator(object):
self.eval_element(element.children[-1])) self.eval_element(element.children[-1]))
elif element.type == 'operator': elif element.type == 'operator':
# Must be an ellipsis, other operators are not evaluated. # Must be an ellipsis, other operators are not evaluated.
types = set() # Ignore for now. assert element.value == '...'
types = set([compiled.create(self, Ellipsis)])
elif element.type == 'dotted_name': elif element.type == 'dotted_name':
types = self._eval_atom(element.children[0]) types = self._eval_atom(element.children[0])
for next_name in element.children[2::2]: for next_name in element.children[2::2]:

8
jedi/parser/tokenize.py
View File

@@ -285,7 +285,13 @@ def generate_tokens(readline):
paren_level += 1 paren_level += 1
elif token in ')]}': elif token in ')]}':
paren_level -= 1 paren_level -= 1
yield OP, token, spos, prefix if token == '...' and not is_py3:
# Ellipsis tokens were not syntax yet, in Python 2.7.
yield OP, '.', spos, prefix
yield OP, '.', (spos[0], spos[1] + 1), ''
yield OP, '.', (spos[0], spos[1] + 2), ''
else:
yield OP, token, spos, prefix
if new_line: if new_line:
end_pos = lnum + 1, 0 end_pos = lnum + 1, 0