Working CR hacked

Author: ubaldot

after/ftplugin/markdown.vim

@@ -126,8 +126,14 @@ endif
 # This is very ugly: you add a - [ ] by pasting the content of register 'o'
 setreg("o", "- [ ] ")
 
-# Redefinition of <cr>
+# 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
+
 nnoremap <buffer> <expr> <CR> empty(links.IsLink())
       \ ? '<ScriptCmd>SetLinkOpFunc()<CR>g@iw'
       \ : '<ScriptCmd>links.OpenLink()<CR>'

lib/funcs.vim

@@ -43,45 +43,14 @@ export def CR_Hacked()
   # Check if the current line starts with '- [ ]' or '- '
   # OBS! If there are issues, check 'formatlistpat' value for markdown
   # filetype
-
   var variant_1 = '-\s\[\(\s*\|x\)*\]\s\+' # - [ ] bla bla bla
   var variant_2 = '-\s\+\(\[\)\@!' # - bla bla bla
   var variant_3 = '\*\s\+' # * bla bla bla
   var variant_4 = '\d\+\.\s\+' # 123. bla bla bla
   var variant_5 = '>\s\+' # Quoted block
 
-  var current_line = getline('.')
-
-  # Check if the current line is an item.
-  # OBS! The following scan the current line through the less general regex (a
-  # regex can be contained in another regex)
-  # TODO: search back the previous \n
-  var is_item = false
-  for variant in [variant_1, variant_2, variant_3, variant_4, variant_5]
-    if current_line =~ $'^\s*{variant}\s*'
-      is_item = true
-      break
-    endif
-  endfor
-
-  # If the current line is not in an item list, act as normal,
-  # i.e. <cr> = \n, otherwise split the current line depending on where is the
-  # cursor
-  var this_line = strcharpart(getline('.'), 0, col('.') - 1)
-  var next_line = strcharpart(getline('.'), col('.') - 1)
-
-  # double <cr> equal to finish the itemization
-  if this_line =~
-      $'^\s*\({variant_1}\|{variant_2}\|{variant_3}'
-            .. $'\|{variant_4}\|{variant_5}\)\s*$'
-      && next_line =~ '^\s*$'
-    this_line = ''
-    is_item = false
-  endif
-
-  # Handle different cases if the current line is an item of a list
-  var item_symbol = ''
-  if is_item
+  def GetItemSymbol(current_line: string): string
+    var item_symbol = ''
     if current_line =~ $'^\s*{variant_1}'
       # If - [x], the next item should be - [ ] anyway.
       item_symbol = $"{current_line->matchstr($'^\s*{variant_1}')
@@ -99,20 +68,61 @@ 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
 
-    # 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}'
-        this_line = $"{current_line->matchstr($'^\s*{variant_4}')}"
-        next_line = strcharpart(current_line, len(item_symbol))
-      else
-        this_line = item_symbol
-        next_line = strcharpart(current_line, len(item_symbol))
+  # Break line at cursor position
+  var this_line = strcharpart(getline('.'), 0, col('.') - 1)
+  var next_line = strcharpart(getline('.'), col('.') - 1)
+
+  # Check if the current line is an item.
+  # OBS! The following scan the current line through the less general regex (a
+  # regex can be contained in another regex)
+  # TODO: search back the previous \n
+  # var is_item = false
+  # for variant in [variant_1, variant_2, variant_3, variant_4, variant_5]
+  #   if current_line =~ $'^\s*{variant}\s*'
+  #     is_item = true
+  #     break
+  #   endif
+  # endfor
+
+  # Handle different cases if the current line is an item of a list
+  var line_nr = line('.')
+  var current_line = getline(line_nr)
+  var item_symbol = GetItemSymbol(current_line)
+  if current_line =~ '^\s\{2,}'
+    while current_line !~ '^\s*$' && line_nr != 0 && empty(item_symbol)
+      line_nr -= 1
+      current_line = getline(line_nr)
+      item_symbol = GetItemSymbol(current_line)
+      echom item_symbol
+      if !empty(item_symbol)
+        break
       endif
+    endwhile
+  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}'
+      this_line = $"{current_line->matchstr($'^\s*{variant_4}')}"
+      next_line = strcharpart(current_line, len(item_symbol))
+    else
+      this_line = item_symbol
+      next_line = strcharpart(current_line, len(item_symbol))
     endif
   endif
 
+  # double <cr> equal to finish the itemization
+  if getline('.') == item_symbol || getline('.') =~ '^\s*\d\+\.\s*$'
+    this_line = ''
+    item_symbol = ''
+  endif
+
   # Add the correct lines
   setline(line('.'), this_line)
   append(line('.'), item_symbol .. next_line)

lib/links.vim

@@ -205,6 +205,7 @@ export def OpenLink()
     if filereadable(link)
       exe $'edit {link}'
     elseif exists(':Open') != 0
+      echom link
       exe $":Open {link}"
     else
       utils.Echowarn('You need a Vim version that has the :Open command')

test/test_markdown_extras.vim

@@ -227,3 +227,27 @@ def g:Test_check_uncheck_todo_keybinding()
   :%bw!
   Cleanup_testfile(src_name_1)
 enddef
+
+def g:Test_CR_hacked_wrapped_lines()
+  # 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
+  setlocal textwidth=78
+
+  const long_line = 'Itaque earum rerum hic *tenetur a sapiente `delectus`, '
+   ..  'ut aut reiciendis voluptatibus maiores*'
+  const expected_lines_36_38 = [
+  '- Itaque earum rerum hic *tenetur a sapiente `delectus`, ut aut reiciendis',
+  '  voluptatibus maiores*',
+  '- hello'
+  ]
+
+  execute $"silent norm Go\<cr>-\<space>{long_line}\<cr>hello"
+  echom assert_equal(expected_lines_36_38, getline(36, 38))
+
+  :%bw!
+  Cleanup_testfile(src_name_1)
+enddef