##// END OF EJS Templates
Adding VI-mode in prompt...
Jonathan Feinberg -
Show More
@@ -1,102 +1,103 b''
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 from prompt_toolkit.enums import EditingMode
10
11
11
12
12 class Prompts(object):
13 class Prompts(object):
13 def __init__(self, shell):
14 def __init__(self, shell):
14 self.shell = shell
15 self.shell = shell
15
16
16 def vi_mode(self):
17 def vi_mode(self):
17 if (getattr(self.shell.pt_app, 'editing_mode', None) == 'VI'
18 if (getattr(self.shell.pt_app, 'editing_mode', None) == EditingMode.VI
18 and self.shell.prompt_includes_vi_mode):
19 and self.shell.prompt_includes_vi_mode):
19 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]+'] '
20 return ''
21 return ''
21
22
22
23
23 def in_prompt_tokens(self):
24 def in_prompt_tokens(self):
24 return [
25 return [
25 (Token.Prompt, self.vi_mode() ),
26 (Token.Prompt, self.vi_mode() ),
26 (Token.Prompt, 'In ['),
27 (Token.Prompt, 'In ['),
27 (Token.PromptNum, str(self.shell.execution_count)),
28 (Token.PromptNum, str(self.shell.execution_count)),
28 (Token.Prompt, ']: '),
29 (Token.Prompt, ']: '),
29 ]
30 ]
30
31
31 def _width(self):
32 def _width(self):
32 return fragment_list_width(self.in_prompt_tokens())
33 return fragment_list_width(self.in_prompt_tokens())
33
34
34 def continuation_prompt_tokens(self, width=None):
35 def continuation_prompt_tokens(self, width=None):
35 if width is None:
36 if width is None:
36 width = self._width()
37 width = self._width()
37 return [
38 return [
38 (Token.Prompt, (' ' * (width - 5)) + '...: '),
39 (Token.Prompt, (' ' * (width - 5)) + '...: '),
39 ]
40 ]
40
41
41 def rewrite_prompt_tokens(self):
42 def rewrite_prompt_tokens(self):
42 width = self._width()
43 width = self._width()
43 return [
44 return [
44 (Token.Prompt, ('-' * (width - 2)) + '> '),
45 (Token.Prompt, ('-' * (width - 2)) + '> '),
45 ]
46 ]
46
47
47 def out_prompt_tokens(self):
48 def out_prompt_tokens(self):
48 return [
49 return [
49 (Token.OutPrompt, 'Out['),
50 (Token.OutPrompt, 'Out['),
50 (Token.OutPromptNum, str(self.shell.execution_count)),
51 (Token.OutPromptNum, str(self.shell.execution_count)),
51 (Token.OutPrompt, ']: '),
52 (Token.OutPrompt, ']: '),
52 ]
53 ]
53
54
54 class ClassicPrompts(Prompts):
55 class ClassicPrompts(Prompts):
55 def in_prompt_tokens(self):
56 def in_prompt_tokens(self):
56 return [
57 return [
57 (Token.Prompt, '>>> '),
58 (Token.Prompt, '>>> '),
58 ]
59 ]
59
60
60 def continuation_prompt_tokens(self, width=None):
61 def continuation_prompt_tokens(self, width=None):
61 return [
62 return [
62 (Token.Prompt, '... ')
63 (Token.Prompt, '... ')
63 ]
64 ]
64
65
65 def rewrite_prompt_tokens(self):
66 def rewrite_prompt_tokens(self):
66 return []
67 return []
67
68
68 def out_prompt_tokens(self):
69 def out_prompt_tokens(self):
69 return []
70 return []
70
71
71 class RichPromptDisplayHook(DisplayHook):
72 class RichPromptDisplayHook(DisplayHook):
72 """Subclass of base display hook using coloured prompt"""
73 """Subclass of base display hook using coloured prompt"""
73 def write_output_prompt(self):
74 def write_output_prompt(self):
74 sys.stdout.write(self.shell.separate_out)
75 sys.stdout.write(self.shell.separate_out)
75 # 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,
76 # because the output will be left-aligned.
77 # because the output will be left-aligned.
77 self.prompt_end_newline = True
78 self.prompt_end_newline = True
78
79
79 if self.do_full_cache:
80 if self.do_full_cache:
80 tokens = self.shell.prompts.out_prompt_tokens()
81 tokens = self.shell.prompts.out_prompt_tokens()
81 prompt_txt = ''.join(s for t, s in tokens)
82 prompt_txt = ''.join(s for t, s in tokens)
82 if prompt_txt and not prompt_txt.endswith('\n'):
83 if prompt_txt and not prompt_txt.endswith('\n'):
83 # Ask for a newline before multiline output
84 # Ask for a newline before multiline output
84 self.prompt_end_newline = False
85 self.prompt_end_newline = False
85
86
86 if self.shell.pt_app:
87 if self.shell.pt_app:
87 print_formatted_text(PygmentsTokens(tokens),
88 print_formatted_text(PygmentsTokens(tokens),
88 style=self.shell.pt_app.app.style, end='',
89 style=self.shell.pt_app.app.style, end='',
89 )
90 )
90 else:
91 else:
91 sys.stdout.write(prompt_txt)
92 sys.stdout.write(prompt_txt)
92
93
93 def write_format_data(self, format_dict, md_dict=None) -> None:
94 def write_format_data(self, format_dict, md_dict=None) -> None:
94 if self.shell.mime_renderers:
95 if self.shell.mime_renderers:
95
96
96 for mime, handler in self.shell.mime_renderers.items():
97 for mime, handler in self.shell.mime_renderers.items():
97 if mime in format_dict:
98 if mime in format_dict:
98 handler(format_dict[mime], None)
99 handler(format_dict[mime], None)
99 return
100 return
100
101
101 super().write_format_data(format_dict, md_dict)
102 super().write_format_data(format_dict, md_dict)
102
103
General Comments 0
You need to be logged in to leave comments. Login now