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

Fix usages.

Browse Source
This commit is contained in:
Dave Halter
2015-01-06 16:54:01 +01:00
parent 9178d314b0
commit 494a3e3307
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jedi/evaluate/representation.py
View File

@@ -242,6 +242,12 @@ class Instance(use_metaclass(CachedMetaClass, Executed)):
def names_dicts(self, search_global): def names_dicts(self, search_global):
yield self._self_names_dict() yield self._self_names_dict()
for s in self.base.py__mro__(self._evaluator)[1:]:
if not isinstance(s, compiled.CompiledObject):
# Compiled objects don't have `self.` names.
for inst in self._evaluator.execute(s):
yield inst._self_names_dict(add_mro=False)
for names_dict in self.base.names_dicts(search_global=False): for names_dict in self.base.names_dicts(search_global=False):
yield LazyInstanceDict(self._evaluator, self, names_dict) yield LazyInstanceDict(self._evaluator, self, names_dict)

2
jedi/parser/tree.py
View File

@@ -1260,7 +1260,7 @@ class CompFor(Simple):
arr.append(name) arr.append(name)
return dct return dct
def names_dicts(self): def names_dicts(self, search_global):
yield self.names_dict yield self.names_dict
def get_defined_names(self): def get_defined_names(self):

6
test/completion/usages.py
View File

@@ -164,7 +164,7 @@ class Super(object):
def base_method(self): def base_method(self):
#< 13 (0,13), (20,13) #< 13 (0,13), (20,13)
self.base_var = 1 self.base_var = 1
#< 13 (0,13), (24,13), (29,13) #< 13 (0,13),
self.instance_var = 1 self.instance_var = 1
#< 8 (0,8), #< 8 (0,8),
@@ -188,12 +188,12 @@ class TestClass(Super):
TestClass.base_var TestClass.base_var
#< 13 (5,13), (0,13), (-24,13) #< 13 (5,13), (0,13)
self.instance_var = 3 self.instance_var = 3
#< 9 (0,8), #< 9 (0,8),
def just_a_method(self): def just_a_method(self):
#< (-5,13), (0,13), (-29,13) #< (-5,13), (0,13)
self.instance_var self.instance_var