Skip to content

Commit

Permalink
Keyword completion after ... should not work, fixes davidhalter/jedi-…
Browse files Browse the repository at this point in the history
  • Loading branch information
davidhalter committed Dec 25, 2019
1 parent 9fb94bb commit f3c8bc1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
3 changes: 2 additions & 1 deletion jedi/api/completion.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ def _complete_python(self, leaf):

completion_names = []
current_line = self._code_lines[self._position[0] - 1][:self._position[1]]
if not current_line or current_line[-1] in ' \t.;':
if not current_line or current_line[-1] in ' \t.;' \
and current_line[-3:] != '...':
completion_names += self._complete_keywords(allowed_transitions)

if any(t in allowed_transitions for t in (PythonTokenTypes.NAME,
Expand Down
4 changes: 4 additions & 0 deletions test/test_api/test_completion.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,3 +283,7 @@ def test_fuzzy_match():
assert fuzzy_match('Condition', 'ii')
assert not fuzzy_match('Condition', 'Ciito')
assert fuzzy_match('Condition', 'Cdiio')


def test_ellipsis_completion(Script):
assert Script('...').completions() == []
6 changes: 4 additions & 2 deletions test/test_inference/test_imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ def test_relative_imports_with_outside_paths(Script):
path=os.path.join(dir, 'api/whatever/test_this.py'),
_project=project,
)
assert [c.name for c in script.complete()] == ['api', 'import', 'whatever']
assert [c.name for c in script.complete()] == ['api', 'whatever']

script = Script(
"from " + '.' * 100,
Expand All @@ -398,7 +398,9 @@ def test_relative_imports_without_path(Script):


def test_relative_import_out_of_file_system(Script):
script = Script("from " + '.' * 100)
code = "from " + '.' * 100
assert not Script(code).complete()
script = Script(code + ' ')
import_, = script.complete()
assert import_.name == 'import'

Expand Down

0 comments on commit f3c8bc1

Please sign in to comment.