Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ install:
travis_retry pip install jupyter ipyparallel
fi;

- travis_retry pip install coveralls jedi==0.9
- travis_retry pip install coveralls jedi
- travis_retry python setup.py install
- cd metakernel_python
- python setup.py install
Expand Down
20 changes: 12 additions & 8 deletions metakernel/magics/python_magic.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
try:
import jedi
from jedi import Interpreter
from jedi.api.helpers import completion_parts
from jedi.parser.user_context import UserContext
from jedi.api.helpers import get_on_completion_name
from jedi import common
except ImportError:
jedi = None

Expand Down Expand Up @@ -133,17 +133,21 @@ def get_completions(self, info):
return []

text = info['code']
interpreter = Interpreter(text, [self.env])

position = (info['line_num'], info['column'])
path = UserContext(text, position).get_path_until_cursor()
path, dot, like = completion_parts(path)
before = text[:len(text) - len(like)]
interpreter = Interpreter(text, [self.env])

lines = common.splitlines(text)
name = get_on_completion_name(
interpreter._get_module_node(),
lines,
position
)
before = text[:len(text) - len(name)]
completions = interpreter.completions()

completions = [before + c.name_with_symbols for c in completions]

self.kernel.log.error(completions)

return [c[info['start']:] for c in completions]

def get_help_on(self, info, level=0, none_on_fail=False):
Expand Down