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

Because of the change in dynamic params, we can now remove the decorator hack in the name finder.

Browse Source
This commit is contained in:
Dave Halter
2014-11-18 13:06:20 +01:00
parent f9276a8bd2
commit 93ffc799f5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/evaluate/__init__.py
View File

@@ -100,7 +100,7 @@ class Evaluator(object):
self.analysis = []
def find_types(self, scope, name_str, position=None, search_global=False,
is_goto=False, resolve_decorator=True):
is_goto=False):
"""
This is the search function. The most important part to debug.
`remove_statements` and `filter_statements` really are the core part of
@@ -113,7 +113,7 @@ class Evaluator(object):
scopes = f.scopes(search_global)
if is_goto:
return f.filter_name(scopes)
return f.find(scopes, resolve_decorator, search_global)
return f.find(scopes, search_global)
@memoize_default(default=[], evaluator_is_first_arg=True)
@recursion.recursion_decorator

8
jedi/evaluate/finder.py
View File

@@ -37,9 +37,9 @@ class NameFinder(object):
self.position = position
@debug.increase_indent
def find(self, scopes, resolve_decorator=True, search_global=False):
def find(self, scopes, search_global=False):
names = self.filter_name(scopes, search_global)
types = self._names_to_types(names, resolve_decorator)
types = self._names_to_types(names)
if not names and not types \
and not (isinstance(self.name_str, pr.Name)
@@ -274,7 +274,7 @@ class NameFinder(object):
return True
return False
def _names_to_types(self, names, resolve_decorator):
def _names_to_types(self, names):
types = []
evaluator = self._evaluator
@@ -319,7 +319,7 @@ class NameFinder(object):
types = list(chain.from_iterable(
evaluator.execute(t) for t in exceptions))
else:
if typ.isinstance(er.Function) and resolve_decorator:
if typ.isinstance(er.Function):
typ = typ.get_decorated_func()
types.append(typ)