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

Refactor compiled.CompiledObject so it always owns an evaluator instance.

Browse Source
This commit is contained in:
Dave Halter
2015-12-08 02:19:33 +01:00
parent 18a10c436f
commit bef5fca516
13 changed files with 149 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jedi/api/keywords.py
View File

@@ -3,7 +3,6 @@ import keyword
from jedi._compatibility import is_py3
from jedi import common
from jedi.evaluate import compiled
from jedi.evaluate.helpers import FakeName
try:
@@ -18,27 +17,27 @@ else:
keys = keyword.kwlist + ['None', 'False', 'True']
def keywords(string='', pos=(0, 0), all=False):
def keywords(evaluator, string='', pos=(0, 0), all=False):
if all:
return set([Keyword(k, pos) for k in keys])
return set([Keyword(evaluator, k, pos) for k in keys])
if string in keys:
return set([Keyword(string, pos)])
return set([Keyword(evaluator, string, pos)])
return set()
def keyword_names(*args, **kwargs):
return [k.name for k in keywords(*args, **kwargs)]
def keyword_names(evaluator, *args, **kwargs):
return [k.name for k in keywords(evaluator, *args, **kwargs)]
def get_operator(string, pos):
return Keyword(string, pos)
def get_operator(evaluator, string, pos):
return Keyword(evaluator, string, pos)
class Keyword(object):
def __init__(self, name, pos):
def __init__(self, evaluator, name, pos):
self.name = FakeName(name, self, pos)
self.start_pos = pos
self.parent = compiled.builtin
self.parent = evaluator.BUILTINS
def get_parent_until(self):
return self.parent