##// END OF EJS Templates
%time magic displays output even when code ends in semicolon #13837 (#13841)...
%time magic displays output even when code ends in semicolon #13837 (#13841) After the magic is evaluated and the result is calculated, the modification tests whether the evaluated magic was _time_ and whether semicolon is the final character. The result is killed if both things happen. My choice would be to remove the _time_ test, so a semicolon would prevent the print of the output of any magic, but this is only a suggestion I keep open. I did not write any automated test, but I can do that once (and if) the solution is accepted. [#13837](https://github.com/ipython/ipython/issues/13837) points to [#10227](https://github.com/ipython/ipython/issues/10227) (_Cell magic result in printing the last evaluated line even if followed by semicolon_). There, somebody says that ';' may be a meaningful character because we could have a C++ expression, for instance. The IPython repository says the documentation for other languages is in Jupyter. I ran Jupyter on my browser with C++ and saw that a semicolon after the last statement prevents the output to be printed (a semicolon between 2 statements in a cell seems to be necessary, though). See attached file for simple examples. Therefore, it seems that the semicolon at the end in C++ already behaves the same way that in Python and is not required by the interpreter. ![IPython_Cpp](https://user-images.githubusercontent.com/5789832/203915670-513514d6-70a4-4efa-b4f4-9a8293d5a1ff.png)

File last commit:

r25386:ee3eebcc
r28070:87de97f2 merge
Show More
prompts.py
108 lines | 3.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
Jonathan Slenders
Upgrade to prompt_toolkit 2.0
r24376 from prompt_toolkit.formatted_text import fragment_list_width, PygmentsTokens
from prompt_toolkit.shortcuts import print_formatted_text
Jonathan Feinberg
Adding VI-mode in prompt...
r25385 from prompt_toolkit.enums import EditingMode
Jonathan Slenders
Upgrade to prompt_toolkit 2.0
r24376
Matthias Bussonnier
Don't compute length of ZeroWidthTokens....
r22471
Thomas Kluyver
New prompts class for terminal interface
r22421 class Prompts(object):
def __init__(self, shell):
self.shell = shell
Matthias Bussonnier
Give some love to the VI mode....
r24684 def vi_mode(self):
Jonathan Feinberg
Adding VI-mode in prompt...
r25385 if (getattr(self.shell.pt_app, 'editing_mode', None) == EditingMode.VI
Antony Lee
Make inclusion of vi mode in prompt togglable.
r24832 and self.shell.prompt_includes_vi_mode):
Jonathan Feinberg
Support vi-mode 'InputFormat' prompt...
r25386 mode = str(self.shell.pt_app.app.vi_state.input_mode)
if mode.startswith('InputMode.'):
mode = mode[10:13].lower()
elif mode.startswith('vi-'):
mode = mode[3:6]
return '['+mode+'] '
Matthias Bussonnier
Give some love to the VI mode....
r24684 return ''
Jonathan Slenders
Upgrade to prompt_toolkit 2.0
r24376 def in_prompt_tokens(self):
Thomas Kluyver
New prompts class for terminal interface
r22421 return [
Matthias Bussonnier
Give some love to the VI mode....
r24684 (Token.Prompt, self.vi_mode() ),
Thomas Kluyver
New prompts class for terminal interface
r22421 (Token.Prompt, 'In ['),
(Token.PromptNum, str(self.shell.execution_count)),
(Token.Prompt, ']: '),
]
def _width(self):
Jonathan Slenders
Upgrade to prompt_toolkit 2.0
r24376 return fragment_list_width(self.in_prompt_tokens())
Thomas Kluyver
New prompts class for terminal interface
r22421
Jonathan Slenders
Upgrade to prompt_toolkit 2.0
r24376 def continuation_prompt_tokens(self, width=None):
Thomas Kluyver
New prompts class for terminal interface
r22421 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):
Jonathan Slenders
Upgrade to prompt_toolkit 2.0
r24376 def in_prompt_tokens(self):
Thomas Kluyver
Switch prompts for doctest_mode
r22429 return [
(Token.Prompt, '>>> '),
]
Jonathan Slenders
Upgrade to prompt_toolkit 2.0
r24376 def continuation_prompt_tokens(self, width=None):
Thomas Kluyver
Switch prompts for doctest_mode
r22429 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
Jonathan Slenders
Upgrade to prompt_toolkit 2.0
r24376 if self.shell.pt_app:
Thomas Kluyver
No newline after output prompt
r24380 print_formatted_text(PygmentsTokens(tokens),
style=self.shell.pt_app.app.style, end='',
)
Thomas Kluyver
Use new prompt machinery to generate Out prompts
r22422 else:
Thomas Kluyver
Fix newline check when prompt consists of empty token
r23132 sys.stdout.write(prompt_txt)
Matthias Bussonnier
Provide hooks for arbitrary mimetypes handling....
r25164
def write_format_data(self, format_dict, md_dict=None) -> None:
if self.shell.mime_renderers:
for mime, handler in self.shell.mime_renderers.items():
if mime in format_dict:
handler(format_dict[mime], None)
return
super().write_format_data(format_dict, md_dict)