CR hacked tested, docs updated

Author: ubaldot

after/ftplugin/markdown.vim

@@ -128,11 +128,11 @@ setreg("o", "- [ ] ")
 
 # Redefinition of <cr>. Unmap if user does not want it.
 inoremap <buffer> <silent> <CR> <ScriptCmd>funcs.CR_Hacked()<CR>
-# if !exists('g:markdown_extras_config')
-#     && has_key(g:markdown_extras_config, 'hack_CR')
-#     && !g:markdown_extras_config['hack_CR']
-#   iunmap <buffer> <cr>
-# endif
+if exists('g:markdown_extras_config')
+    && has_key(g:markdown_extras_config, 'hack_CR')
+    && !g:markdown_extras_config['hack_CR']
+  iunmap <buffer> <cr>
+endif
 
 nnoremap <buffer> <expr> <CR> empty(links.IsLink())
       \ ? '<ScriptCmd>SetLinkOpFunc()<CR>g@iw'

doc/markdown_extras.txt

@@ -182,6 +182,8 @@ filling it with he various keys.
                           greater than 0.
         "fuzzy_search"    Fuzzy or exact search in the links popup.
                           Default: |true|.
+        "hack_CR"         Set to |false| for the standard behavior of <CR>.
+                          Default: |true|.
 
 
                                           *g:markdown_extras_indices*

lib/funcs.vim

@@ -68,8 +68,6 @@ export def CR_Hacked()
       )
       item_symbol = $"{current_line->matchstr($'^\s*{variant_4}')
             \ ->substitute(string(curr_nr), string(curr_nr + 1), '')}"
-    # elseif current_line =~ $'^\s\+'
-    #   item_symbol = $"{current_line->matchstr($'^\s\+')}"
     endif
     return item_symbol
   enddef
@@ -106,6 +104,12 @@ export def CR_Hacked()
     endwhile
   endif
 
+  # if item_symbol = '' it may still mean that we are not in an item list but
+  # yet we have an indendent line, hence, we must preserve the leading spaces
+  if empty(item_symbol)
+    item_symbol = $"{getline('.')->matchstr($'^\s\+')}"
+  endif
+
   # The following is in case the cursor is on the lhs of the item_symbol
   if col('.') < len(item_symbol)
     if current_line =~ $'^\s*{variant_4}'

test/test_markdown_extras.vim

@@ -251,3 +251,31 @@ def g:Test_CR_hacked_wrapped_lines()
   :%bw!
   Cleanup_testfile(src_name_1)
 enddef
+
+
+def g:Test_CR_hacked_preserve_indent()
+  # OBS! normal shall be without ! because we are testing <CR> which is
+  # hacked!
+  Generate_testfile(lines_1, src_name_1)
+  vnew
+  exe $"edit {src_name_1}"
+  setlocal spell spelllang=la
+
+  const test_string = "\<space>\<space>\<space>\<space>\<space>today\<space>is"
+    .. "\<space>a\<cr>beautiful\<space>day"
+
+  const expected_lines_35_39 = [
+        '',
+        '     today is a',
+        '     beautiful day',
+        '',
+        'ciao',
+  ]
+
+  execute $"silent norm Go\<cr>{test_string}\<cr>\<cr>ciao"
+
+  echom assert_equal(expected_lines_35_39, getline(35, 39))
+
+  :%bw!
+  Cleanup_testfile(src_name_1)
+enddef