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

start caching some parts of the imports to significantly speed up numpy completions.

Browse Source
This commit is contained in:
Dave Halter
2014-04-10 14:55:49 +02:00
parent 14bf618af0
commit 4bc89d638c
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/api/classes.py
View File

@@ -493,7 +493,8 @@ class Completion(BaseDefinition):
# separately in Completion. # separately in Completion.
if self._definition.isinstance(pr.Import) and self._definition.alias is None: if self._definition.isinstance(pr.Import) and self._definition.alias is None:
i = imports.ImportPath(self._evaluator, self._definition, True) i = imports.ImportPath(self._evaluator, self._definition, True)
return imports.Importer(i.import_path + [unicode(self._name)], import_path = tuple(i.import_path + [unicode(self._name)])
return imports.Importer(self._evaluator, import_path,
i._importer.module).follow(self._evaluator) i._importer.module).follow(self._evaluator)
return super(Completion, self)._follow_statements_imports() return super(Completion, self)._follow_statements_imports()

15
jedi/evaluate/imports.py
View File

@@ -16,7 +16,7 @@ import pkgutil
import sys import sys
from itertools import chain from itertools import chain
from jedi._compatibility import find_module from jedi._compatibility import find_module, use_metaclass
from jedi import common from jedi import common
from jedi import debug from jedi import debug
from jedi import cache from jedi import cache
@@ -27,6 +27,7 @@ from jedi.evaluate import helpers
from jedi import settings from jedi import settings
from jedi.common import source_to_unicode from jedi.common import source_to_unicode
from jedi.evaluate import compiled from jedi.evaluate import compiled
from jedi.evaluate.cache import CachedMetaClass, memoize_default
class ModuleNotFound(Exception): class ModuleNotFound(Exception):
@@ -69,7 +70,8 @@ class ImportPath(pr.Base):
import_path.pop() import_path.pop()
module = import_stmt.get_parent_until() module = import_stmt.get_parent_until()
self._importer = Importer(import_path, module, import_stmt.relative_count) self._importer = Importer(self._evaluator, tuple(import_path), module,
import_stmt.relative_count)
def __repr__(self): def __repr__(self):
return '<%s: %s>' % (type(self).__name__, self.import_stmt) return '<%s: %s>' % (type(self).__name__, self.import_stmt)
@@ -219,8 +221,8 @@ class ImportPath(pr.Base):
return scopes return scopes
class Importer(object): class Importer(use_metaclass(CachedMetaClass)):
def __init__(self, import_path, module, level=0): def __init__(self, evaluator, import_path, module, level=0):
""" """
An implementation similar to ``__import__``. Use `follow_file_system` An implementation similar to ``__import__``. Use `follow_file_system`
to actually follow the imports. to actually follow the imports.
@@ -233,10 +235,13 @@ class Importer(object):
:param import_path: List of namespaces (strings). :param import_path: List of namespaces (strings).
""" """
debug.speed('imp')
self._evaluator = evaluator
self.import_path = import_path self.import_path = import_path
self.level = level self.level = level
self.module = module self.module = module
path = module.path path = module.path
print(self.import_path)
# TODO abspath # TODO abspath
self.file_path = os.path.dirname(path) if path is not None else None self.file_path = os.path.dirname(path) if path is not None else None
@@ -246,6 +251,7 @@ class Importer(object):
path = os.path.dirname(path) path = os.path.dirname(path)
return path return path
@memoize_default()
def sys_path_with_modifications(self): def sys_path_with_modifications(self):
# If you edit e.g. gunicorn, there will be imports like this: # If you edit e.g. gunicorn, there will be imports like this:
# `from gunicorn import something`. But gunicorn is not in the # `from gunicorn import something`. But gunicorn is not in the
@@ -267,6 +273,7 @@ class Importer(object):
return evaluator.follow_path(iter(rest), [scope], scope) return evaluator.follow_path(iter(rest), [scope], scope)
return [scope] return [scope]
@memoize_default()
def follow_file_system(self): def follow_file_system(self):
if self.file_path: if self.file_path:
sys_path_mod = list(self.sys_path_with_modifications()) sys_path_mod = list(self.sys_path_with_modifications())