Upgrade to prompt_toolkit 0.58

Author: jonathanslenders

ptpython/history_browser.py

@@ -17,14 +17,13 @@
 from prompt_toolkit.layout.containers import HSplit, VSplit, Window, FloatContainer, Float, ConditionalContainer, Container, ScrollOffsets
 from prompt_toolkit.layout.controls import BufferControl, FillControl
 from prompt_toolkit.layout.dimension import LayoutDimension as D
-from prompt_toolkit.layout.highlighters import SearchHighlighter, SelectionHighlighter
 from prompt_toolkit.layout.lexers import PygmentsLexer
 from prompt_toolkit.layout.margins import Margin, ScrollbarMargin
-from prompt_toolkit.layout.processors import Processor, Transformation
+from prompt_toolkit.layout.processors import Processor, Transformation, HighlightSearchProcessor, HighlightSelectionProcessor
 from prompt_toolkit.layout.screen import Char
 from prompt_toolkit.layout.toolbars import ArgToolbar, SearchToolbar
 from prompt_toolkit.layout.toolbars import TokenListToolbar
-from prompt_toolkit.layout.utils import explode_tokens
+from prompt_toolkit.layout.utils import token_list_to_text
 from prompt_toolkit.utils import Callback
 from pygments.lexers import RstLexer
 from pygments.token import Token
@@ -143,9 +142,9 @@ def create_layout(python_input, history_mapping):
     Create and return a `Container` instance for the history
     application.
     """
-    highlighters = [
-        SearchHighlighter(preview_search=True),
-        SelectionHighlighter()]
+    processors = [
+        HighlightSearchProcessor(preview_search=True),
+        HighlightSelectionProcessor()]
 
     help_window = create_popup_window(
         title='History Help',
@@ -154,7 +153,7 @@ def create_layout(python_input, history_mapping):
                 buffer_name=HELP_BUFFER,
                 default_char=Char(token=Token),
                 lexer=PygmentsLexer(RstLexer),
-                highlighters=highlighters),
+                input_processors=processors),
             right_margins=[ScrollbarMargin()],
             scroll_offsets=ScrollOffsets(top=2, bottom=2)))
 
@@ -170,9 +169,9 @@ def create_layout(python_input, history_mapping):
                 Window(
                     content=BufferControl(
                         buffer_name=HISTORY_BUFFER,
-                        wrap_lines=False,
                         lexer=PygmentsLexer(PythonLexer),
-                        highlighters=highlighters),
+                        input_processors=processors),
+                    wrap_lines=False,
                     left_margins=[HistoryMargin(history_mapping)],
                     scroll_offsets=ScrollOffsets(top=2, bottom=2)),
                 # Separator.
@@ -182,10 +181,9 @@ def create_layout(python_input, history_mapping):
                 Window(
                     content=BufferControl(
                         buffer_name=DEFAULT_BUFFER,
-                        wrap_lines=False,
-                        highlighters=highlighters,
-                        input_processors=[GrayExistingText(history_mapping)],
+                        input_processors=processors + [GrayExistingText(history_mapping)],
                         lexer=PygmentsLexer(PythonLexer)),
+                    wrap_lines=False,
                     left_margins=[ResultMargin(history_mapping)],
                     scroll_offsets=ScrollOffsets(top=2, bottom=2)),
             ]),
@@ -244,7 +242,7 @@ class HistoryMargin(Margin):
     def __init__(self, history_mapping):
         self.history_mapping = history_mapping
 
-    def get_width(self, cli):
+    def get_width(self, cli, ui_content):
         return 2
 
     def create_margin(self, cli, window_render_info, width, height):
@@ -289,7 +287,7 @@ class ResultMargin(Margin):
     def __init__(self, history_mapping):
         self.history_mapping = history_mapping
 
-    def get_width(self, cli):
+    def get_width(self, cli, ui_content):
         return 2
 
     def create_margin(self, cli, window_render_info, width, height):
@@ -328,24 +326,15 @@ class GrayExistingText(Processor):
     """
     def __init__(self, history_mapping):
         self.history_mapping = history_mapping
-        self._len_before = len(history_mapping.original_document.text_before_cursor)
-        self._len_after = len(history_mapping.original_document.text_after_cursor)
-
-    def apply_transformation(self, cli, document, tokens):
-        if self._len_before or self._len_after:
-            tokens = explode_tokens(tokens)
-            pos_after = len(tokens) - self._len_after
-
-            text_before = ''.join(t[1] for t in tokens[:self._len_before])
-            text_after = ''.join(t[1] for t in tokens[pos_after:])
-
-            return Transformation(
-                document=document,
-                tokens=explode_tokens([(Token.History.ExistingInput, text_before)] +
-                       tokens[self._len_before:pos_after] +
-                       [(Token.History.ExistingInput, text_after)]))
+        self._lines_before = len(history_mapping.original_document.text_before_cursor.splitlines())
+
+    def apply_transformation(self, cli, document, lineno, source_to_display, tokens):
+        if (lineno < self._lines_before or
+                lineno >= self._lines_before + len(self.history_mapping.selected_lines)):
+            text = token_list_to_text(tokens)
+            return Transformation(tokens=[(Token.History.ExistingInput, text)])
         else:
-            return Transformation(document, tokens)
+            return Transformation(tokens=tokens)
 
 
 class HistoryMapping(object):

ptpython/layout.py

@@ -4,16 +4,15 @@
 from __future__ import unicode_literals
 
 from prompt_toolkit.enums import DEFAULT_BUFFER, SEARCH_BUFFER
-from prompt_toolkit.filters import IsDone, HasCompletions, RendererHeightIsKnown, Always, HasFocus, Condition
+from prompt_toolkit.filters import IsDone, HasCompletions, RendererHeightIsKnown, HasFocus, Condition
 from prompt_toolkit.key_binding.vi_state import InputMode
 from prompt_toolkit.layout.containers import Window, HSplit, VSplit, FloatContainer, Float, ConditionalContainer, ScrollOffsets
 from prompt_toolkit.layout.controls import BufferControl, TokenListControl, FillControl
 from prompt_toolkit.layout.dimension import LayoutDimension
 from prompt_toolkit.layout.lexers import SimpleLexer
 from prompt_toolkit.layout.margins import PromptMargin
 from prompt_toolkit.layout.menus import CompletionsMenu, MultiColumnCompletionsMenu
-from prompt_toolkit.layout.highlighters import SearchHighlighter, SelectionHighlighter, MatchingBracketHighlighter, ConditionalHighlighter
-from prompt_toolkit.layout.processors import ConditionalProcessor, AppendAutoSuggestion
+from prompt_toolkit.layout.processors import ConditionalProcessor, AppendAutoSuggestion, HighlightSearchProcessor, HighlightSelectionProcessor, HighlightMatchingBracketProcessor
 from prompt_toolkit.layout.screen import Char
 from prompt_toolkit.layout.toolbars import CompletionsToolbar, ArgToolbar, SearchToolbar, ValidationToolbar, SystemToolbar, TokenListToolbar
 from prompt_toolkit.layout.utils import token_list_width
@@ -94,7 +93,7 @@ def goto_next(cli, mouse_event):
             if selected:
                 tokens.append((Token.SetCursorPosition, ''))
 
-            tokens.append((token.Status, ' ' * (14 - len(status)), goto_next))
+            tokens.append((token.Status, ' ' * (13 - len(status)), goto_next))
             tokens.append((T, '<' if selected else ''))
             tokens.append((T, '\n'))
 
@@ -266,7 +265,7 @@ def get_prompt(cli):
         def get_continuation_prompt(cli, width):
             return get_prompt_style().in2_tokens(cli, width)
 
-        super(PythonPromptMargin, self).__init__(get_prompt, get_continuation_prompt, 
+        super(PythonPromptMargin, self).__init__(get_prompt, get_continuation_prompt,
                 show_numbers=Condition(lambda cli: python_input.show_line_numbers))
 
 
@@ -478,27 +477,25 @@ def menu_position(cli):
             BufferControl(
                 buffer_name=DEFAULT_BUFFER,
                 lexer=lexer,
-                highlighters=[
+                input_processors=[
+                    ConditionalProcessor(
+                        processor=HighlightSearchProcessor(preview_search=True),
+                        filter=HasFocus(SEARCH_BUFFER),
+                    ),
+                    HighlightSelectionProcessor(),
                     # Show matching parentheses, but only while editing.
-                    ConditionalHighlighter(
-                        highlighter=MatchingBracketHighlighter(chars='[](){}'),
+                    ConditionalProcessor(
+                        processor=HighlightMatchingBracketProcessor(chars='[](){}'),
                         filter=HasFocus(DEFAULT_BUFFER) & ~IsDone() &
                             Condition(lambda cli: python_input.highlight_matching_parenthesis)),
-                    ConditionalHighlighter(
-                        highlighter=SearchHighlighter(preview_search=Always()),
-                        filter=HasFocus(SEARCH_BUFFER)),
-                    SelectionHighlighter(),
-                ],
-                input_processors=[
                     ConditionalProcessor(
                         processor=AppendAutoSuggestion(),
                         filter=~IsDone())
                 ] + extra_buffer_processors,
                 menu_position=menu_position,
-                wrap_lines=Condition(lambda cli: python_input.wrap_lines),
 
                 # Make sure that we always see the result of an reverse-i-search:
-                preview_search=Always(),
+                preview_search=True,
             ),
             left_margins=[PythonPromptMargin(python_input)],
             # Scroll offsets. The 1 at the bottom is important to make sure the
@@ -508,6 +505,7 @@ def menu_position(cli):
             get_height=(lambda cli: (
                 None if cli.is_done or python_input.show_exit_confirmation
                         else input_buffer_height)),
+            wrap_lines=Condition(lambda cli: python_input.wrap_lines),
         )
 
     return HSplit([
@@ -536,7 +534,8 @@ def menu_position(cli):
                               bottom=1,
                               content=exit_confirmation(python_input)),
                         Float(bottom=0, right=0, height=1,
-                              content=meta_enter_message(python_input)),
+                              content=meta_enter_message(python_input),
+                              hide_when_covering_content=True),
                         Float(bottom=1, left=1, right=0, content=python_sidebar_help(python_input)),
                     ]),
                 ArgToolbar(),

ptpython/python_input.py

@@ -615,7 +615,7 @@ def run():
         cli.eventloop.run_in_executor(run)
 
     def on_reset(self, cli):
-        self.key_bindings_manager.reset()
+        self.key_bindings_manager.reset(cli)
         self.signatures = []
 
     def enter_history(self, cli):

ptpython/repl.py

@@ -14,7 +14,7 @@
 
 from prompt_toolkit.application import AbortAction
 from prompt_toolkit.enums import DEFAULT_BUFFER
-from prompt_toolkit.interface import AcceptAction, CommandLineInterface
+from prompt_toolkit.interface import AcceptAction
 from prompt_toolkit.layout.utils import token_list_width
 from prompt_toolkit.shortcuts import create_asyncio_eventloop
 from prompt_toolkit.styles import style_from_pygments

ptpython/style.py

@@ -1,9 +1,8 @@
 from __future__ import unicode_literals
 
 from pygments.token import Token, Keyword, Name, Comment, String, Operator, Number
-from pygments.style import Style
 from pygments.styles import get_style_by_name, get_all_styles
-from prompt_toolkit.styles import default_style_extensions, style_from_dict
+from prompt_toolkit.styles import DEFAULT_STYLE_EXTENSIONS, style_from_dict
 from prompt_toolkit.utils import is_windows, is_conemu_ansi
 
 __all__ = (
@@ -41,7 +40,7 @@ def generate_style(python_style, ui_style):
     assert isinstance(ui_style, dict)
 
     styles = {}
-    styles.update(default_style_extensions)
+    styles.update(DEFAULT_STYLE_EXTENSIONS)
     styles.update(python_style)
     styles.update(ui_style)
 

setup.py

@@ -21,7 +21,7 @@
     install_requires = [
         'docopt',
         'jedi>=0.9.0',
-        'prompt_toolkit==0.57',
+        'prompt_toolkit==0.58',
         'pygments',
     ],
     entry_points={