Added SurroundSimple

Author: ubaldot

lib/utils.vim

@@ -127,6 +127,64 @@ export def RemoveSurrounding(
     endif
 enddef
 
+export def SurroundSimple(open_delimiter: string,
+    close_delimiter: string,
+    open_delimiters_dict: dict<string>,
+    close_delimiters_dict: dict<string>,
+    text_object: string = '')
+
+  var open_string = open_delimiter
+  var open_regex = open_delimiters_dict[open_string]
+  var open_delimiter_dict = {open_string: open_regex}
+
+  var close_string = close_delimiter
+  var close_regex = close_delimiters_dict[close_string]
+  var close_delimiter_dict = {close_string: close_regex}
+  # Set marks
+  var A = getcharpos("'<")
+  var B = getcharpos("'>")
+  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
+
+  # line and column of point A
+  var lA = A[1]
+  var cA = A[2]
+
+  # line and column of point B
+  var lB = B[1]
+  var cB = B[2]
+
+  if A == B
+    return
+  endif
+
+  var toA = strcharpart(getline(lA), 0, cA - 1) .. open_string
+  var fromB = close_string .. strcharpart(getline(lB), cB)
+
+  # If on the same line
+  if lA == lB
+    # Overwrite everything that is in the middle
+    var A_to_B = strcharpart(getline(lA), cA - 1, cB - cA + 1)
+    setline(lA, toA .. A_to_B .. fromB)
+  else
+    var lineA = toA .. strcharpart(getline(lA), cA - 1)
+    setline(lA, lineA)
+    var lineB = strcharpart(getline(lB), 0, cB - 1) .. fromB
+    setline(lB, lineB)
+    var l = 1
+    # Fix intermediate lines
+    while lA + l < lB
+      setline(lA + l, getline(lA + l))
+      l += 1
+    endwhile
+  endif
+enddef
+
 export def SurroundSmart(open_delimiter: string,
     close_delimiter: string,
     open_delimiters_dict: dict<string>,

test/test_markdown_extras.vim

@@ -148,7 +148,6 @@ def g:Test_markdown_lists()
   Cleanup_testfile(src_name_1)
 enddef
 
-
 def g:Test_check_uncheck_todo_keybinding()
 
   Generate_testfile(lines_1, src_name_1)

test/test_utils.vim

@@ -398,7 +398,7 @@ def g:Test_Dict2ListOfDicts()
 
 enddef
 
-def g:Test_Surround_one_line()
+def g:Test_SurroundSmart_one_line()
   vnew
   Generate_testfile(lines_2, src_name_2)
   exe $"edit {src_name_2}"
@@ -430,7 +430,56 @@ def g:Test_Surround_one_line()
   Cleanup_testfile(src_name_2)
 enddef
 
-def g:Test_Surround_one_line_smart_delimiters()
+def g:Test_SurroundSimple_one_line_smart_delimiters()
+  vnew
+  Generate_testfile(lines_2, src_name_2)
+  exe $"edit {src_name_2}"
+  setlocal conceallevel=0
+
+  # Smart delimiters
+  var expected_value = [
+      'incidunt ut (labore et ~~dolore magnam) aliquam quaerat~~ voluptatem. Ut',
+      'enim ad `minima *[veniam`, quis no~~strum]* exercitationem~~ ullam corporis',
+      'suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur?'
+    ]
+  cursor(11, 29)
+  exe "norm! va[\<esc>"
+  utils.SurroundSimple('*', '*', text_style_dict, text_style_dict)
+  var actual_value = getline(10, 12)
+  echom assert_equal(expected_value, actual_value)
+
+  # # Test with junk between A and B. Overwrite everything and avoid consecutive
+  # # delimiters of same type, like ** **
+  # cursor(21, 41)
+  # exe "norm! va(\<esc>"
+  # expected_value = [
+  #   'dolores et quas molestias excepturi sint, obcaecati cupiditate non',
+  #   'pro**vident, (similique sunt in culpa, qui officia deserunt)**',
+  #   'mollitia) animi, id est laborum et dolorum fuga.'
+  # ]
+  # utils.SurroundSimple('**', '**', text_style_dict, text_style_dict)
+  # actual_value = getline(20, 22)
+  # assert_equal(expected_value, actual_value)
+
+  # # Test with junk between A and B. Overwrite everything and avoid consecutive
+  # # delimiters of same type, like ** **
+  # cursor(19, 20)
+  # exe "norm! va(\<esc>"
+  # expected_value = [
+  #   'At vero eos et accusamus et iusto odio dignissimos ducimus, qui',
+  #   'blandit*iis pra(esentium voluptatum deleniti atque) corrupti*, quos',
+  #   'dolores et quas molestias excepturi sint, obcaecati cupiditate non',
+  # ]
+  # utils.SurroundSimple('*', '*', text_style_dict, text_style_dict)
+  # actual_value = getline(18, 20)
+  # assert_equal(expected_value, actual_value)
+
+  # :%bw!
+  # Cleanup_testfile(src_name_2)
+enddef
+
+
+def g:Test_SurroundSmart_one_line_smart_delimiters()
   # vnew
   Generate_testfile(lines_2, src_name_2)
   exe $"edit {src_name_2}"