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

Fix an issue with as_names.

Browse Source
This commit is contained in:
Dave Halter
2014-09-26 15:48:49 +02:00
parent 7fea6437d9
commit 6f29e802c2
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/parser/__init__.py
View File

@@ -101,8 +101,8 @@ class Parser(object):
self.module.used_names[tok_name] = set([simple]) self.module.used_names[tok_name] = set([simple])
self.module.temp_used_names = [] self.module.temp_used_names = []
if isinstance(simple, pr.Statement): if isinstance(simple, pr.Statement):
for name, call in simple.get_names_dict().items(): for name, calls in simple.get_names_dict().items():
self._scope.add_name_call(name, call) self._scope.add_name_calls(name, calls)
def _parse_dotted_name(self, pre_used_token=None): def _parse_dotted_name(self, pre_used_token=None):
""" """

13
jedi/parser/representation.py
View File

@@ -270,9 +270,9 @@ class Scope(Simple, DocstringMixin):
def is_scope(self): def is_scope(self):
return True return True
def add_name_call(self, name, call): def add_name_calls(self, name, calls):
"""Add a name to the names_dict.""" """Add a name to the names_dict."""
self._names_dict[name].append(call) self._names_dict[name] += calls
def get_names_dict(self): def get_names_dict(self):
return self._names_dict return self._names_dict
@@ -688,14 +688,14 @@ class Flow(Scope):
s.parent = self.use_as_parent s.parent = self.use_as_parent
self.set_vars = [] self.set_vars = []
def add_name_call(self, name, call): def add_name_calls(self, name, calls):
"""Add a name to the names_dict.""" """Add a name to the names_dict."""
parent = self.parent parent = self.parent
if isinstance(parent, Module): if isinstance(parent, Module):
# TODO this also looks like code smell. Look for opportunities to # TODO this also looks like code smell. Look for opportunities to
# remove. # remove.
parent = self._sub_module parent = self._sub_module
parent.add_name_call(name, call) parent.add_name_calls(name, calls)
@property @property
def parent(self): def parent(self):
@@ -1020,7 +1020,7 @@ class Statement(Simple, DocstringMixin):
if c.next is None or isinstance(c.next, Array): if c.next is None or isinstance(c.next, Array):
break break
c = c.next c = c.next
dct[unicode(c.name)] = call dct[unicode(c.name)].append(call)
for calls, operation in self.assignment_details: for calls, operation in self.assignment_details:
search_calls(calls) search_calls(calls)
@@ -1030,7 +1030,8 @@ class Statement(Simple, DocstringMixin):
search_calls(self.expression_list()) search_calls(self.expression_list())
for as_name in self.as_names: for as_name in self.as_names:
dct[unicode(as_name)].append(as_name) dct[unicode(as_name)].append(Call(self._sub_module, as_name,
as_name.start_pos, as_name.end_pos, self))
return dct return dct
def is_global(self): def is_global(self):