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

Fix an issue with predefined_if_name_dict.

Browse Source
This commit is contained in:
Dave Halter
2015-12-27 17:30:40 +01:00
parent 03eaf8455f
commit c0f7e9f820
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jedi/evaluate/__init__.py
View File

@@ -249,13 +249,27 @@ class Evaluator(object):
del self.predefined_if_name_dict_dict[if_stmt] del self.predefined_if_name_dict_dict[if_stmt]
return result return result
else: else:
return self._eval_element_if_evaluated(element)
return self._eval_element_cached(element) return self._eval_element_cached(element)
else: else:
if predefined_if_name_dict: if predefined_if_name_dict:
return self._eval_element_not_cached(element) return self._eval_element_not_cached(element)
else: else:
return self._eval_element_if_evaluated(element)
return self._eval_element_cached(element) return self._eval_element_cached(element)
def _eval_element_if_evaluated(self, element):
"""
TODO This function is temporary: Merge with eval_element.
"""
parent = element
while parent is not None:
parent = parent.parent
predefined_if_name_dict = self.predefined_if_name_dict_dict.get(parent)
if predefined_if_name_dict:
return self._eval_element_not_cached(element)
return self._eval_element_cached(element)
@memoize_default(evaluator_is_first_arg=True) @memoize_default(evaluator_is_first_arg=True)
def _eval_element_cached(self, element): def _eval_element_cached(self, element):
return self._eval_element_not_cached(element) return self._eval_element_not_cached(element)