Added underscored text styles

Author: ubaldot

after/ftplugin/markdown.vim

@@ -18,18 +18,24 @@ var code_regex = '\v(\\|`)@<!``@!'
 # var italic_regex = '\v(\\|\*)@<!\*\*@!'
 # The following picks standalone * and the last * of \**
 # It excludes escaped * (i.e. \*\*\*, and sequences like ****)
-var italic_regex = '\v((\\|\*)@<!|(\\\*)@<=)\*\*@!'
+var italic_regex = '\v((\\|\*)@<!|(\\\*))@<=\*\*@!'
+var italic_regex_u = '\v((\\|_)@<!|(\\_))@<=_(_)@!'
 var bold_regex = '\v(\\|\*)@<!\*\*\*@!'
+var bold_regex_u = '\v(\\|_)@<!___@!'
 var strikethrough_regex = '\v(\\|\~)@<!\~\~\~@!'
 
 export var text_style_dict = {'`': code_regex,
   '*': italic_regex,
   '**': bold_regex,
+  '_': italic_regex_u,
+  '__': bold_regex_u,
   '~~': strikethrough_regex}
 
 export var code_dict = {'`': code_regex}
 export var italic_dict = {'*': italic_regex}
 export var bold_dict = {'**': bold_regex}
+export var italic_dict_u = {'_': italic_regex_u}
+export var bold_dict_u = {'__': bold_regex_u}
 export var strikethrough_dict = {'~~': strikethrough_regex}
 
 if exists('g:markdown_extras_config') != 0

lib/utils.vim

@@ -27,21 +27,6 @@ export def ZipLists(l1: list<any>, l2: list<any>): list<list<any>>
     return map(range(min_len), $'[{l1}[v:val], {l2}[v:val]]')
 enddef
 
-export def RegexList2RegexOR(regex_list: list<string>,
-    very_magic: bool = false): string
-  # Convert a list of regex into an atom where each regex is separated by a OR
-  # condition
-
-  var result = ''
-  if very_magic
-    result =  regex_list->map((_, val) => substitute(val, '^\(\\v\)', '', ''))
-          ->join('|')->printf('\v(%s)')
-  else
-    result = regex_list->join('\|')->printf('\(%s\)')
-  endif
-  return result
-enddef
-
 export def GetTextObject(textobject: string): dict<any>
   # You pass a text object like 'iw' and it returns the text
   # associated to it along with the start and end positions
@@ -113,7 +98,6 @@ export def RemoveSurrounding(
       # Remove right delimiter
       var lB = interval[1][1]
       var cB = interval[1][2]
-      # echom "cB: " .. cB
       # The value of cB may no longer be valid since we shortened the line
       if lA == lB
         cB = cB - len(keys(open_delimiter_dict)[0])
@@ -123,7 +107,6 @@ export def RemoveSurrounding(
         strcharpart(getline(lB), 0, cB)
         .. strcharpart(getline(lB), cB + len(keys(close_delimiter_dict)[0]))
       setline(lB, newline)
-      # echom "lB: " .. newline
     endif
 enddef
 
@@ -146,7 +129,6 @@ export def SurroundSimple(open_delimiter: string,
   if !empty(text_object)
     # GetTextObject is called for setting '[ and '] marks through a yank.
     var text_object_dict = GetTextObject(text_object)
-    echom text_object
     A = text_object_dict.start
     B = text_object_dict.end
   endif
@@ -204,7 +186,6 @@ export def SurroundSmart(open_delimiter: string,
   if !empty(text_object)
     # GetTextObject is called for setting '[ and '] marks through a yank.
     var text_object_dict = GetTextObject(text_object)
-    echom text_object
     A = text_object_dict.start
     B = text_object_dict.end
   endif
@@ -323,32 +304,43 @@ export def SurroundSmart(open_delimiter: string,
   # Next, we have to adjust the text between A and B, by removing all the
   # possible delimiters left between them.
 
-  var all_delimiters_regex =
-    RegexList2RegexOR(values(open_delimiters_dict), true)
-
   # If on the same line
   if lA == lB
     # Overwrite everything that is in the middle
     var A_to_B = ''
 
     A_to_B = strcharpart(getline(lA), cA - 1, cB - cA + 1)
-      ->substitute(all_delimiters_regex, '', 'g')
+    for regex in values(open_delimiters_dict)
+      A_to_B = A_to_B->substitute(regex, '', 'g')
+    endfor
 
     setline(lA, toA .. A_to_B .. fromB)
 
   else
-    var lineA = toA .. strcharpart(getline(lA), cA - 1)
-      ->substitute(all_delimiters_regex, '', 'g')
-    echom "lineA: " .. lineA
+    # Set line A
+    var afterA = strcharpart(getline(lA), cA - 1)
+    for regex in values(open_delimiters_dict)
+      afterA = afterA->substitute(regex, '', 'g')
+    endfor
+    var lineA = toA .. afterA
     setline(lA, lineA)
-    var lineB = strcharpart(getline(lB), 0, cB - 1)
-      ->substitute(all_delimiters_regex, '', 'g') .. fromB
-    echom "lineB: " .. lineB
+
+    # Set line B
+    var beforeB = strcharpart(getline(lB), 0, cB - 1)
+    for regex in values(open_delimiters_dict)
+      beforeB = beforeB->substitute(regex, '', 'g')
+    endfor
+    var lineB = beforeB .. fromB
     setline(lB, lineB)
-    var l = 1
+
     # Fix intermediate lines
+    var l = 1
     while lA + l < lB
-      setline(lA + l, getline(lA + l)->substitute(all_delimiters_regex, '', 'g') )
+      var middleline = getline(lA + l)
+      for regex in values(open_delimiters_dict)
+        middleline = middleline-> substitute(regex, '', 'g')
+      endfor
+      setline(lA + l, middleline)
       l += 1
     endwhile
   endif
@@ -579,10 +571,6 @@ export def IsInRange(
     setcharpos("'a", range[0])
     setcharpos("'b", range[1])
     if IsBetweenMarks("'a", "'b")
-      # echom "cur_pos: " .. string(getcharpos('.'))
-      # echom "range[0]: " .. string(range[0])
-      # echom "range[1]: " .. string(range[1])
-      echom IsBetweenMarks("'a", "'b")
       interval = [range[0], range[1]]
       break
     endif

test/runner.vim

@@ -24,15 +24,15 @@ def RunTests(test_file: string)
 		->sort()
 
 	# Check is user defined some function name erroneously
-	var wrong_test_functions = copy(all_functions)->filter('v:val !~ "Test_"')
+	var wrong_test_functions = copy(all_functions)->filter('v:val !~ "^Test_"')
 	echom "wrong_functions: " .. string(wrong_test_functions)
   if !empty(wrong_test_functions)
 		writefile([$'WARNING: The following tests are skipped: {wrong_test_functions}'], 'results.txt', 'a')
 		writefile([''], 'results.txt', 'a')
 	endif
 
 	# Pick the good functions
-	var test_functions = copy(all_functions)->filter('v:val =~ "Test_"')
+	var test_functions = copy(all_functions)->filter('v:val =~ "^Test_"')
 	echom "test_functions: " .. string(test_functions)
   if test_functions->empty()
     # No tests are found

test/test_regex.vim

@@ -2,9 +2,11 @@ vim9script noclear
 
 import "../after/ftplugin/markdown.vim"
 
+var code_regex = markdown.code_dict['`']
 var italic_regex = markdown.italic_dict['*']
 var bold_regex = markdown.bold_dict['**']
-var code_regex = markdown.code_dict['`']
+var italic_regex_u = markdown.italic_dict_u['_']
+var bold_regex_u = markdown.bold_dict_u['__']
 var strikethrough_regex = markdown.strikethrough_dict['~~']
 
 var src_name = 'testfile.md'
@@ -27,6 +29,22 @@ def Generate_markdown_testfile()
         Quis autem ~vel eum iure reprehenderit qui in ea voluptate velit esse
         quam nihil molestiae consequatur,~ vel `illum qui \~ dolorem eum` fugiat quo
         voluptas nulla \` pariatur``?
+
+        At vero eos et _accusamus et iusto odio dignissimos ducimus qui blanditiis
+        praesentium voluptatum deleniti_ atque corrupti \_quos dolores et quas molestias
+        excepturi sint occaecati _cupiditate_ non \_provident, similique sunt in culpa qui
+        officia deserunt \__mollitia animi_, id est laborum et dolorum fuga. Et harum
+        quidem rerum facilis est et expedita distinctio.
+
+        Nam libero tempore, __cum soluta nobis est eligendi optio cumque nihil
+        impedit quo minus id quod maxime placeat facere possimus, omnis
+        voluptas assumenda est__, omnis dolor repellendus. Temporibus autem
+        quibusdam et aut officiis debitis aut rerum necessitatibus saepe
+        eveniet ut et voluptates repudiandae sint et molestiae non recusandae.
+
+        Itaque earum rerum hic tenetur a sapiente delectus, ut aut
+        reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus
+        asperiores repellat
   END
    writefile(lines, src_name)
 enddef
@@ -37,6 +55,7 @@ enddef
 
 # Tests start here
 def g:Test_regex()
+  vnew
   Generate_markdown_testfile()
 
   exe $"edit {src_name}"
@@ -87,6 +106,29 @@ def g:Test_regex()
   endwhile
   assert_equal(expected_pos, actual_pos)
 
+  # italic underscore
+  expected_pos = [[18, 16], [19, 32], [20, 26],
+    [20, 37], [21, 20], [21, 35], [0, 0]]
+  actual_pos = []
+  tmp = []
+  cursor(1, 1)
+  while tmp != [0, 0]
+    tmp = searchpos(italic_regex_u, 'W')
+    add(actual_pos, tmp)
+  endwhile
+  assert_equal(expected_pos, actual_pos)
+
+  # bold underscore
+  expected_pos = [[24, 21], [26, 23], [0, 0]]
+  actual_pos = []
+  tmp = []
+  cursor(1, 1)
+  while tmp != [0, 0]
+    tmp = searchpos(bold_regex_u, 'W')
+    add(actual_pos, tmp)
+  endwhile
+  assert_equal(expected_pos, actual_pos)
+
   # redraw!
   # sleep 3
   :%bw!