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
2014-12-03 16:34:31 +01:00
parent 6bf154de5e
commit b2267d3878
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jedi/api/usages.py
View File

@@ -69,6 +69,9 @@ def usages(evaluator, definition_names, mods):
result = evaluator.goto(name) result = evaluator.goto(name)
if [c for c in compare_array(result) if c in compare_definitions]: if [c for c in compare_array(result) if c in compare_definitions]:
definitions.append(classes.Definition(evaluator, name)) definitions.append(classes.Definition(evaluator, name))
# Previous definitions might be imports, so include them
# (because goto might return that import name).
compare_definitions += compare_array([name])
continue # TODO DELETE continue # TODO DELETE
@@ -101,5 +104,5 @@ def usages_add_import_modules(evaluator, definitions):
imp_or_stmt = d.get_definition() imp_or_stmt = d.get_definition()
if isinstance(imp_or_stmt, pr.Import): if isinstance(imp_or_stmt, pr.Import):
s = imports.ImportWrapper(evaluator, d) s = imports.ImportWrapper(evaluator, d)
new |= s.follow(is_goto=True) new |= set(s.follow(is_goto=True))
return set(definitions) | new return set(definitions) | new

2
jedi/parser/tree.py
View File

@@ -399,7 +399,7 @@ class Simple(Base):
def name_for_position(self, position): def name_for_position(self, position):
for c in self.children: for c in self.children:
if isinstance(c, Leaf): if isinstance(c, Leaf):
if c.start_pos <= position <= c.end_pos: if isinstance(c, Name) and c.start_pos <= position <= c.end_pos:
return c return c
else: else:
result = c.name_for_position(position) result = c.name_for_position(position)