VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-02-21 06:38:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

change cache_call_signatures, so that it has a well defined input.

Browse Source
This commit is contained in:
Dave Halter
2014-10-06 16:07:33 +02:00
parent 87574e9d2e
commit bbdb4703ec
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/api/__init__.py
View File

@@ -545,8 +545,7 @@ class Script(object):
return [] return []
with common.scale_speed_settings(settings.scale_call_signatures): with common.scale_speed_settings(settings.scale_call_signatures):
_callable = lambda: self._evaluator.eval_call(call) origins = cache.cache_call_signatures(self._evaluator, call, self.source,
origins = cache.cache_call_signatures(_callable, self.source,
self._pos, user_stmt) self._pos, user_stmt)
debug.speed('func_call followed') debug.speed('func_call followed')

27
jedi/cache.py
View File

@@ -57,7 +57,7 @@ def clear_time_caches(delete_all=False):
global _time_caches global _time_caches
if delete_all: if delete_all:
_time_caches = [] _time_caches[:] = []
_star_import_cache.clear() _star_import_cache.clear()
parser_cache.clear() parser_cache.clear()
else: else:
@@ -80,14 +80,17 @@ def time_cache(time_add_setting):
dct = {} dct = {}
_time_caches.append(dct) _time_caches.append(dct)
def wrapper(optional_callable, *args, **kwargs): def wrapper(*args, **kwargs):
key = key_func(*args, **kwargs) generator = key_func(*args, **kwargs)
value = None key = next(generator)
if key in dct: try:
expiry, value = dct[key] expiry, value = dct[key]
if expiry > time.time(): if expiry > time.time():
return value return value
value = optional_callable() except KeyError:
pass
value = next(generator)
time_add = getattr(settings, time_add_setting) time_add = getattr(settings, time_add_setting)
if key is not None: if key is not None:
dct[key] = time.time() + time_add, value dct[key] = time.time() + time_add, value
@@ -97,7 +100,7 @@ def time_cache(time_add_setting):
@time_cache("call_signatures_validity") @time_cache("call_signatures_validity")
def cache_call_signatures(source, user_pos, stmt): def cache_call_signatures(evaluator, call, source, user_pos, stmt):
"""This function calculates the cache key.""" """This function calculates the cache key."""
index = user_pos[0] - 1 index = user_pos[0] - 1
lines = common.splitlines(source) lines = common.splitlines(source)
@@ -108,7 +111,8 @@ def cache_call_signatures(source, user_pos, stmt):
before_bracket = re.match(r'.*\(', whole, re.DOTALL) before_bracket = re.match(r'.*\(', whole, re.DOTALL)
module_path = stmt.get_parent_until().path module_path = stmt.get_parent_until().path
return None if module_path is None else (module_path, before_bracket, stmt.start_pos) yield None if module_path is None else (module_path, before_bracket, stmt.start_pos)
yield evaluator.eval_call(call)
def underscore_memoization(func): def underscore_memoization(func):
@@ -177,11 +181,12 @@ def cache_star_import(func):
def _invalidate_star_import_cache_module(module, only_main=False): def _invalidate_star_import_cache_module(module, only_main=False):
""" Important if some new modules are being reparsed """ """ Important if some new modules are being reparsed """
with common.ignored(KeyError): try:
t, modules = _star_import_cache[module] t, modules = _star_import_cache[module]
except KeyError:
pass
else:
del _star_import_cache[module] del _star_import_cache[module]
for m in modules: for m in modules:
_invalidate_star_import_cache_module(m, only_main=True) _invalidate_star_import_cache_module(m, only_main=True)