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

add keyword_names method to keyword module (includes test), fixes #248

Browse Source
This commit is contained in:
David Halter
2013-08-06 10:55:05 +04:30
parent 66a984b8ef
commit 0dc3106569
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jedi/api.py
View File

@@ -138,11 +138,11 @@ class Script(object):
if (u.relative_count > 0 or u.from_ns) and not re.search( if (u.relative_count > 0 or u.from_ns) and not re.search(
r'(,|from)\s*$|import\s+$', completion_line): r'(,|from)\s*$|import\s+$', completion_line):
completions += ((k, bs) for k completions += ((k, bs) for k
in keywords.get_keywords('import')) in keywords.keyword_names('import'))
if not path and not isinstance(u, pr.Import): if not path and not isinstance(u, pr.Import):
# add keywords # add keywords
completions += ((k, bs) for k in keywords.get_keywords( completions += ((k, bs) for k in keywords.keyword_names(
all=True)) all=True))
needs_dot = not dot and path needs_dot = not dot and path
@@ -324,7 +324,7 @@ class Script(object):
scopes = resolve_import_paths(scopes) scopes = resolve_import_paths(scopes)
# add keywords # add keywords
scopes |= keywords.get_keywords(string=goto_path, pos=self.pos) scopes |= keywords.keywords(string=goto_path, pos=self.pos)
d = set([api_classes.Definition(s) for s in scopes d = set([api_classes.Definition(s) for s in scopes
if not isinstance(s, imports.ImportPath._GlobalNamespace)]) if not isinstance(s, imports.ImportPath._GlobalNamespace)])

12
jedi/keywords.py
View File

@@ -4,6 +4,7 @@ import pydoc
import keyword import keyword
from jedi._compatibility import is_py3k from jedi._compatibility import is_py3k
from jedi import parsing_representation as pr
from jedi import common from jedi import common
import builtin import builtin
@@ -19,7 +20,7 @@ else:
keys = keyword.kwlist + ['None', 'False', 'True'] keys = keyword.kwlist + ['None', 'False', 'True']
def get_keywords(string='', pos=(0, 0), all=False): def keywords(string='', pos=(0, 0), all=False):
if all: if all:
return set([Keyword(k, pos) for k in keys]) return set([Keyword(k, pos) for k in keys])
if string in keys: if string in keys:
@@ -27,6 +28,15 @@ def get_keywords(string='', pos=(0, 0), all=False):
return set() return set()
def keyword_names(*args, **kwargs):
kwds = []
for k in keywords(*args, **kwargs):
start = k.start_pos
end = start[0], start[1] + len(k.name)
kwds.append(pr.Name(k.parent, [(k.name, start)], start, end, k))
return kwds
def get_operator(string, pos): def get_operator(string, pos):
return Keyword(string, pos) return Keyword(string, pos)

7
test/test_regression.py
View File

@@ -81,6 +81,11 @@ class TestRegression(TestBase):
r = list(self.goto_definitions("asfdasfd", (1, 1))) r = list(self.goto_definitions("asfdasfd", (1, 1)))
assert len(r) == 0 assert len(r) == 0
k = self.completions("fro")[0]
imp_start = '\nThe ``import'
assert k.raw_doc.startswith(imp_start)
assert k.doc.startswith(imp_start)
def test_operator_doc(self): def test_operator_doc(self):
r = list(self.goto_definitions("a == b", (1, 3))) r = list(self.goto_definitions("a == b", (1, 3)))
assert len(r) == 1 assert len(r) == 1
@@ -447,7 +452,6 @@ class TestRegression(TestBase):
class TestDocstring(TestBase): class TestDocstring(TestBase):
def test_function_doc(self): def test_function_doc(self):
defs = self.goto_definitions(""" defs = self.goto_definitions("""
def func(): def func():
@@ -538,7 +542,6 @@ class TestSpeed(TestBase):
class TestInterpreterAPI(unittest.TestCase): class TestInterpreterAPI(unittest.TestCase):
def check_interpreter_complete(self, source, namespace, completions, def check_interpreter_complete(self, source, namespace, completions,
**kwds): **kwds):
script = api.Interpreter(source, [namespace], **kwds) script = api.Interpreter(source, [namespace], **kwds)