Implemented breakindent option and added soft wrap mark.

Author: jonathanslenders

pyvim/commands/commands.py

@@ -624,6 +624,21 @@ def disable_wrap(editor):
     " disable line wrapping. "
     editor.wrap_lines = False
 
+
+@set_cmd('breakindent')
+@set_cmd('bri')
+def enable_breakindent(editor):
+    " Enable the breakindent option. "
+    editor.break_indent = True
+
+
+@set_cmd('nobreakindent')
+@set_cmd('nobri')
+def disable_breakindent(editor):
+    " Enable the breakindent option. "
+    editor.break_indent = False
+
+
 @set_cmd('mouse')
 def enable_mouse(editor):
     " Enable mouse . "

pyvim/editor.py

@@ -63,6 +63,7 @@ def __init__(self, config_directory='~/.pyvim', input=None, output=None):
         self.scroll_offset = 0  # ':set scrolloff'
         self.relative_number = False  # ':set relativenumber'
         self.wrap_lines = True  # ':set wrap'
+        self.break_indent = False  # ':set breakindent'
         self.cursorline = False  # ':set cursorline'
         self.cursorcolumn = False  # ':set cursorcolumn'
         self.colorcolumn = []  # ':set colorcolumn'. List of integers.

pyvim/layout.py

@@ -23,6 +23,7 @@
 from .welcome_message import WELCOME_MESSAGE_TOKENS, WELCOME_MESSAGE_HEIGHT, WELCOME_MESSAGE_WIDTH
 
 import pyvim.window_arrangement as window_arrangement
+from functools import partial
 
 import re
 import sys
@@ -551,7 +552,8 @@ def wrap_lines():
             colorcolumns=(
                 lambda: [ColorColumn(pos) for pos in self.editor.colorcolumn]),
             ignore_content_width=True,
-            ignore_content_height=True)
+            ignore_content_height=True,
+            get_line_prefix=partial(self._get_line_prefix, editor_buffer.buffer))
 
         return HSplit([
             window,
@@ -607,6 +609,20 @@ def preview_search():
             search_buffer_control=self.search_control,
             focus_on_click=True)
 
+    def _get_line_prefix(self, buffer, line_number, wrap_count):
+        if wrap_count > 0:
+            result = []
+
+            # Add 'breakindent' prefix.
+            if self.editor.break_indent:
+                line = buffer.document.lines[line_number]
+                prefix = line[:len(line) - len(line.lstrip())]
+                result.append(('', prefix))
+
+            # Add softwrap mark.
+            result.append(('class:soft-wrap', '...'))
+            return result
+        return ''
 
 class ReportingProcessor(Processor):
     """

pyvim/style.py

@@ -87,6 +87,9 @@ def generate_built_in_styles():
     'completions-toolbar.arrow':              'bg:#aaddaa #000000 bold',
     'completions-toolbar completion':         'bg:#aaddaa #000000',
     'completions-toolbar current-completion': 'bg:#444444 #ffffff',
+
+    # Soft wrap.
+    'soft-wrap':                          '#888888',
 }