-

Author: jonathanslenders

prompt_toolkit/contrib/python_input.py

@@ -361,15 +361,15 @@ def get_tokens(cli):
  else:
  completion_style = 'off'
 
- append((TB, ' [F2] Show sidebar (on)\n'))
+ append((TB, ' [F2] Sidebar  (on)\n'))
  append((TB, ' [F3] Completion menu (%s)\n' % completion_style))
  append((TB, ' [F4] Input mode (%s)\n' % mode))
  append((TB, ' [F5] Merge from history\n'))
 
  if settings.paste_mode:
- append((TB, ' [F6] Paste   (on) \n'))
+ append((TB, ' [F6] Paste mode (on) \n'))
  else:
- append((TB, ' [F6] Paste   (off) \n'))
+ append((TB, ' [F6] Paste mode (off) \n'))
 
  if settings.currently_multiline:
  append((TB, ' [F7] Multiline (on)\n'))
@@ -416,9 +416,11 @@ def get_tokens(cli):
 
  for i, p in enumerate(sig.params):
  if i == sig.index:
- append((Signature.CurrentName, str(p.name)))
+ # Note: we use `_Param.description` instead of
+ # `_Param.name`, that way we also get the '*' before args.
+ append((Signature.CurrentName, str(p.description)))
  else:
- append((Signature, str(p.name)))
+ append((Signature, str(p.description)))
  append((Signature.Operator, ', '))
 
  if sig.params:
@@ -563,7 +565,7 @@ def __init__(self):
  token = Token.Toolbar.Status
 
  def get_tokens(cli):
- return [(token, ' [F2] Show sidebar')]
+ return [(token, ' [F2] Sidebar')]
 
  super(ShowSidebarButtonInfo, self).__init__(
  TokenListControl(get_tokens, default_char=Char(token=token)),

prompt_toolkit/layout/toolbars.py

@@ -45,7 +45,7 @@ def __init__(self):
  super(SystemToolbar, self).__init__(
  SystemToolbarControl(),
  height=LayoutDimension.exact(1),
- filter=HasFocus('system'))
+ filter=HasFocus('system') & ~IsReturning() & ~IsAborting() & ~IsExiting())
 
 
 class ArgToolbarControl(TokenListControl):
@@ -94,7 +94,7 @@ def __init__(self):
  super(SearchToolbar, self).__init__(
  SearchToolbarControl(),
  height=LayoutDimension.exact(1),
- filter=HasSearch())
+ filter=HasSearch() & ~IsReturning() & ~IsAborting() & ~IsExiting())
 
 
 class CompletionsToolbarControl(UIControl):