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

Improvments to on import completion.

Browse Source
This commit is contained in:
Dave Halter
2014-11-26 02:13:24 +01:00
parent 149b4d8ad5
commit a940c31a86
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jedi/api/__init__.py
View File

@@ -134,7 +134,7 @@ class Script(object):
importer = helpers.check_error_statements( importer = helpers.check_error_statements(
self._evaluator, module, self._pos self._evaluator, module, self._pos
) )
print(importer.completion_names(self._evaluator, True)) #print(importer.completion_names(self._evaluator, True))
return [(name, module) for name in importer.completion_names(self._evaluator, True)] return [(name, module) for name in importer.completion_names(self._evaluator, True)]
elif isinstance(user_stmt, pr.Import): elif isinstance(user_stmt, pr.Import):
# TODO this paragraph is necessary, but not sure it works. # TODO this paragraph is necessary, but not sure it works.
@@ -189,7 +189,10 @@ class Script(object):
if not path and not isinstance(user_stmt, pr.Import): if not path and not isinstance(user_stmt, pr.Import):
# add keywords # add keywords
completions += ((k, b) for k in keywords.keyword_names(all=True)) #completions += ((k, b) for k in keywords.keyword_names(all=True))
pass
# TODO delete? We should search for valid parser
# transformations.
needs_dot = not dot and path needs_dot = not dot and path

8
jedi/api/helpers.py
View File

@@ -3,6 +3,7 @@ Helpers for the API
""" """
import re import re
from jedi.parser import tree as pt
from jedi.evaluate import imports from jedi.evaluate import imports
@@ -47,5 +48,12 @@ def importer_from_error_statement(evaluator, module, error_statement, pos):
for typ, nodes in error_statement.stack: for typ, nodes in error_statement.stack:
if typ == 'dotted_name': if typ == 'dotted_name':
names += nodes[::2] names += nodes[::2]
elif typ == 'import_from':
for node in nodes:
if isinstance(node, pt.Node) and node.type == 'dotted_name':
names += node.children[::2]
print(typ, nodes)
print('x', names)
return imports.get_importer(evaluator, names, module, level) return imports.get_importer(evaluator, names, module, level)

1
jedi/evaluate/imports.py
View File

@@ -446,6 +446,7 @@ class _Importer(object):
scope, rest = self.follow_file_system() scope, rest = self.follow_file_system()
if rest: if rest:
# follow the rest of the import (not FS -> classes, functions) # follow the rest of the import (not FS -> classes, functions)
return []
raise NotImplementedError raise NotImplementedError
# old # old
return evaluator.follow_path(iter(rest), [scope], scope) return evaluator.follow_path(iter(rest), [scope], scope)