##// END OF EJS Templates
First step in reintegrating Jedi...
First step in reintegrating Jedi If Jedi is installed expose a private API use it with prompt toolkit. Jedi does not _yet_ provide all the completion IPython has, so this is still a bit awkward. In order to debug this (and see what is Jedi provided we for now inject a fake Jedi/IPython delimiter in the menu. Jedi completion and this behavior are enabled by default, but could likely be opt-in. Add also a number of debug flags to be able to track why jedi is not working, and/or what completions are found by IPython and not Jedi. That should give us a bit of heads up and feedback to know whether we can remove part of the IPython completer, and more especially if we can drop `python_matches`. Once `python_matches` is dropped and some other of the current matchers are either dropped or converted to the new API, that should simplify the internal quite a bit. That would just be too much for an already BIG pull-request.

File last commit:

r23132:83d273e2
r23284:3ff1be2e
Show More
prompts.py
79 lines | 2.3 KiB | text/x-python | PythonLexer
Thomas Kluyver
Add __future__ import for prompts module
r22428 """Terminal input and output prompts."""
Thomas Kluyver
New prompts class for terminal interface
r22421 from pygments.token import Token
Thomas Kluyver
Use new prompt machinery to generate Out prompts
r22422 import sys
from IPython.core.displayhook import DisplayHook
Thomas Kluyver
New prompts class for terminal interface
r22421
Matthias Bussonnier
Don't compute length of ZeroWidthTokens....
r22471 from prompt_toolkit.layout.utils import token_list_width
Thomas Kluyver
New prompts class for terminal interface
r22421 class Prompts(object):
def __init__(self, shell):
self.shell = shell
def in_prompt_tokens(self, cli=None):
return [
(Token.Prompt, 'In ['),
(Token.PromptNum, str(self.shell.execution_count)),
(Token.Prompt, ']: '),
]
def _width(self):
Matthias Bussonnier
Don't compute length of ZeroWidthTokens....
r22471 return token_list_width(self.in_prompt_tokens())
Thomas Kluyver
New prompts class for terminal interface
r22421
def continuation_prompt_tokens(self, cli=None, width=None):
if width is None:
width = self._width()
return [
(Token.Prompt, (' ' * (width - 5)) + '...: '),
]
def rewrite_prompt_tokens(self):
width = self._width()
return [
(Token.Prompt, ('-' * (width - 2)) + '> '),
]
def out_prompt_tokens(self):
return [
(Token.OutPrompt, 'Out['),
(Token.OutPromptNum, str(self.shell.execution_count)),
(Token.OutPrompt, ']: '),
]
Thomas Kluyver
Use new prompt machinery to generate Out prompts
r22422
Thomas Kluyver
Switch prompts for doctest_mode
r22429 class ClassicPrompts(Prompts):
def in_prompt_tokens(self, cli=None):
return [
(Token.Prompt, '>>> '),
]
def continuation_prompt_tokens(self, cli=None, width=None):
return [
(Token.Prompt, '... ')
]
def rewrite_prompt_tokens(self):
return []
def out_prompt_tokens(self):
return []
Thomas Kluyver
Use new prompt machinery to generate Out prompts
r22422 class RichPromptDisplayHook(DisplayHook):
"""Subclass of base display hook using coloured prompt"""
def write_output_prompt(self):
sys.stdout.write(self.shell.separate_out)
Thomas Kluyver
Empty prompt effectively ends with newline...
r23131 # If we're not displaying a prompt, it effectively ends with a newline,
# because the output will be left-aligned.
self.prompt_end_newline = True
Thomas Kluyver
Use new prompt machinery to generate Out prompts
r22422 if self.do_full_cache:
tokens = self.shell.prompts.out_prompt_tokens()
Thomas Kluyver
Fix newline check when prompt consists of empty token
r23132 prompt_txt = ''.join(s for t, s in tokens)
if prompt_txt and not prompt_txt.endswith('\n'):
Thomas Kluyver
Empty prompt effectively ends with newline...
r23131 # Ask for a newline before multiline output
self.prompt_end_newline = False
Thomas Kluyver
Fix newline check when prompt consists of empty token
r23132
Thomas Kluyver
Use new prompt machinery to generate Out prompts
r22422 if self.shell.pt_cli:
self.shell.pt_cli.print_tokens(tokens)
else:
Thomas Kluyver
Fix newline check when prompt consists of empty token
r23132 sys.stdout.write(prompt_txt)