##// END OF EJS Templates
support simple prompt
Matthias Bussonnier -
Show More
@@ -1,90 +1,92
1 """Terminal input and output prompts."""
1 """Terminal input and output prompts."""
2
2
3 from pygments.token import Token
3 from pygments.token import Token
4 import sys
4 import sys
5
5
6 from IPython.core.displayhook import DisplayHook
6 from IPython.core.displayhook import DisplayHook
7
7
8 from prompt_toolkit.formatted_text import fragment_list_width, PygmentsTokens
8 from prompt_toolkit.formatted_text import fragment_list_width, PygmentsTokens
9 from prompt_toolkit.shortcuts import print_formatted_text
9 from prompt_toolkit.shortcuts import print_formatted_text
10
10
11
11
12 class Prompts(object):
12 class Prompts(object):
13 def __init__(self, shell):
13 def __init__(self, shell):
14 self.shell = shell
14 self.shell = shell
15
15
16 def vi_mode(self):
16 def vi_mode(self):
17 if not hasattr(self.shell.pt_app, 'editing_mode'):
18 return ''
17 if self.shell.pt_app.editing_mode == 'VI':
19 if self.shell.pt_app.editing_mode == 'VI':
18 return '['+str(self.shell.pt_app.app.vi_state.input_mode)[3:6]+'] '
20 return '['+str(self.shell.pt_app.app.vi_state.input_mode)[3:6]+'] '
19 return ''
21 return ''
20
22
21
23
22 def in_prompt_tokens(self):
24 def in_prompt_tokens(self):
23 return [
25 return [
24 (Token.Prompt, self.vi_mode() ),
26 (Token.Prompt, self.vi_mode() ),
25 (Token.Prompt, 'In ['),
27 (Token.Prompt, 'In ['),
26 (Token.PromptNum, str(self.shell.execution_count)),
28 (Token.PromptNum, str(self.shell.execution_count)),
27 (Token.Prompt, ']: '),
29 (Token.Prompt, ']: '),
28 ]
30 ]
29
31
30 def _width(self):
32 def _width(self):
31 return fragment_list_width(self.in_prompt_tokens())
33 return fragment_list_width(self.in_prompt_tokens())
32
34
33 def continuation_prompt_tokens(self, width=None):
35 def continuation_prompt_tokens(self, width=None):
34 if width is None:
36 if width is None:
35 width = self._width()
37 width = self._width()
36 return [
38 return [
37 (Token.Prompt, (' ' * (width - 5)) + '...: '),
39 (Token.Prompt, (' ' * (width - 5)) + '...: '),
38 ]
40 ]
39
41
40 def rewrite_prompt_tokens(self):
42 def rewrite_prompt_tokens(self):
41 width = self._width()
43 width = self._width()
42 return [
44 return [
43 (Token.Prompt, ('-' * (width - 2)) + '> '),
45 (Token.Prompt, ('-' * (width - 2)) + '> '),
44 ]
46 ]
45
47
46 def out_prompt_tokens(self):
48 def out_prompt_tokens(self):
47 return [
49 return [
48 (Token.OutPrompt, 'Out['),
50 (Token.OutPrompt, 'Out['),
49 (Token.OutPromptNum, str(self.shell.execution_count)),
51 (Token.OutPromptNum, str(self.shell.execution_count)),
50 (Token.OutPrompt, ']: '),
52 (Token.OutPrompt, ']: '),
51 ]
53 ]
52
54
53 class ClassicPrompts(Prompts):
55 class ClassicPrompts(Prompts):
54 def in_prompt_tokens(self):
56 def in_prompt_tokens(self):
55 return [
57 return [
56 (Token.Prompt, '>>> '),
58 (Token.Prompt, '>>> '),
57 ]
59 ]
58
60
59 def continuation_prompt_tokens(self, width=None):
61 def continuation_prompt_tokens(self, width=None):
60 return [
62 return [
61 (Token.Prompt, '... ')
63 (Token.Prompt, '... ')
62 ]
64 ]
63
65
64 def rewrite_prompt_tokens(self):
66 def rewrite_prompt_tokens(self):
65 return []
67 return []
66
68
67 def out_prompt_tokens(self):
69 def out_prompt_tokens(self):
68 return []
70 return []
69
71
70 class RichPromptDisplayHook(DisplayHook):
72 class RichPromptDisplayHook(DisplayHook):
71 """Subclass of base display hook using coloured prompt"""
73 """Subclass of base display hook using coloured prompt"""
72 def write_output_prompt(self):
74 def write_output_prompt(self):
73 sys.stdout.write(self.shell.separate_out)
75 sys.stdout.write(self.shell.separate_out)
74 # If we're not displaying a prompt, it effectively ends with a newline,
76 # If we're not displaying a prompt, it effectively ends with a newline,
75 # because the output will be left-aligned.
77 # because the output will be left-aligned.
76 self.prompt_end_newline = True
78 self.prompt_end_newline = True
77
79
78 if self.do_full_cache:
80 if self.do_full_cache:
79 tokens = self.shell.prompts.out_prompt_tokens()
81 tokens = self.shell.prompts.out_prompt_tokens()
80 prompt_txt = ''.join(s for t, s in tokens)
82 prompt_txt = ''.join(s for t, s in tokens)
81 if prompt_txt and not prompt_txt.endswith('\n'):
83 if prompt_txt and not prompt_txt.endswith('\n'):
82 # Ask for a newline before multiline output
84 # Ask for a newline before multiline output
83 self.prompt_end_newline = False
85 self.prompt_end_newline = False
84
86
85 if self.shell.pt_app:
87 if self.shell.pt_app:
86 print_formatted_text(PygmentsTokens(tokens),
88 print_formatted_text(PygmentsTokens(tokens),
87 style=self.shell.pt_app.app.style, end='',
89 style=self.shell.pt_app.app.style, end='',
88 )
90 )
89 else:
91 else:
90 sys.stdout.write(prompt_txt)
92 sys.stdout.write(prompt_txt)
General Comments 0
You need to be logged in to leave comments. Login now