Give CompletionMenu a is_visible function.

Author: jonathanslenders

prompt_toolkit/layout/__init__.py

@@ -216,7 +216,7 @@ def write_input_scrolled(self, cli, screen, write_content,
  self.vertical_scroll = (temp_screen.cursor_position.y + 1) - max_height
 
  # Scroll down if we need space for the menu.
- if self.need_to_show_completion_menu(cli):
+ if self._need_to_show_completion_menu(cli):
  menu_size = self.menus[0].get_height(self._line(cli).complete_state)
  if temp_screen.cursor_position.y - self.vertical_scroll >= max_height - menu_size:
  self.vertical_scroll = (temp_screen.cursor_position.y + 1) - (max_height - menu_size)
@@ -240,7 +240,7 @@ def write_input_scrolled(self, cli, screen, write_content,
  y_after_input = y + top_margin
 
  # Show completion menu.
- if not is_done and self.need_to_show_completion_menu(cli):
+ if not is_done and self._need_to_show_completion_menu(cli):
  y, x = temp_screen._cursor_mappings[self._line(cli).complete_state.original_document.cursor_position]
  self.menus[0].write(screen, (y - self.vertical_scroll + top_margin, x + left_margin_width), self._line(cli).complete_state)
 
@@ -256,11 +256,8 @@ def write_input_scrolled(self, cli, screen, write_content,
 
  return return_value
 
- def need_to_show_completion_menu(self, cli): # XXX: remove
- if cli.input_processor.input_mode in (InputMode.SYSTEM, InputMode.INCREMENTAL_SEARCH):
- return False
-
- return self.menus and self._line(cli).complete_state
+ def _need_to_show_completion_menu(self, cli):
+ return self.menus and self.menus[0].is_visible(cli)
 
  def write_to_screen(self, cli, screen, min_height):
  """

prompt_toolkit/layout/menus.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 from pygments.token import Token
+from ..enums import InputMode
 
 __all__ = (
  'CompletionMenu',
@@ -20,8 +21,18 @@ class CompletionMenu(object):
  progress_button_token = Token.CompletionMenu.ProgressButton
  progress_bar_token = Token.CompletionMenu.ProgressBar
 
- def __init__(self, max_height=5):
+ def __init__(self, max_height=5, line_name='default'):
  self.max_height = max_height
+ self.line_name = line_name
+
+ def is_visible(self, cli):
+ """
+ True when this menu is visible.
+ """
+ if cli.input_processor.input_mode in (InputMode.SYSTEM, InputMode.INCREMENTAL_SEARCH):
+ return False
+
+ return bool(cli.lines[self.line_name].complete_state)
 
  def get_height(self, complete_state):
  """