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

Some small import completion fixes.

Browse Source
This commit is contained in:
Dave Halter
2014-12-11 13:00:48 +01:00
parent c4c3ef5a21
commit d6b2a64343
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/api/helpers.py
View File

@@ -54,6 +54,9 @@ def importer_from_error_statement(error_statement, pos):
for typ, nodes in error_statement.stack: for typ, nodes in error_statement.stack:
if typ == 'dotted_name': if typ == 'dotted_name':
names += check_dotted(nodes) names += check_dotted(nodes)
elif typ == 'import_name':
if nodes[0].start_pos <= pos <= nodes[0].end_pos:
return None, 0, False
elif typ == 'import_from': elif typ == 'import_from':
for node in nodes: for node in nodes:
if isinstance(node, pt.Node) and node.type == 'dotted_name': if isinstance(node, pt.Node) and node.type == 'dotted_name':

10
test/test_integration_keyword.py
View File

@@ -3,7 +3,6 @@ Test of keywords and ``jedi.keywords``
""" """
import jedi import jedi
from jedi import Script, common from jedi import Script, common
import pytest
def test_goto_assignments_keyword(): def test_goto_assignments_keyword():
@@ -20,11 +19,8 @@ def test_keyword():
defs = Script("print").goto_definitions() defs = Script("print").goto_definitions()
assert [d.doc for d in defs] assert [d.doc for d in defs]
with pytest.raises(jedi.NotFoundError): assert Script("import").goto_assignments() == []
Script("import").goto_assignments()
completions = Script("import", 1, 1).completions() completions = Script("import", 1, 1).completions()
assert len(completions) == 0 assert len(completions) > 10 and 'if' in [c.name for c in completions]
with common.ignored(jedi.NotFoundError): # TODO shouldn't throw that. assert Script("assert").goto_definitions() == []
defs = Script("assert").goto_definitions()
assert len(defs) == 1