Marks '[ and '] are saved/restored

Author: ubaldot

lib/utils.vim

@@ -42,24 +42,32 @@ export def RegexList2RegexOR(regex_list: list<string>,
   return result
 enddef
 
-export def GetTextObject(textobject: string): string
+export def GetTextObject(textobject: string): dict<any>
   # You pass a text object like 'iw' and it returns the text
-  # associated to it.
+  # associated to it along with the start and end positions
   #
   # Note that when you yank some text, the registers '[' and ']' are set, so
   # after call this function, you can retrieve start and end position of the
   # text-object by looking at such marks.
 
-  # Backup the content of register t (arbitrary choice, YMMV)
+  # Backup the content of register t (arbitrary choice, YMMV) and marks
   var oldreg = getreg("t")
+  var saved_A = getcharpos("'[")
+  var saved_B = getcharpos("']")
   # silently yank the text covered by whatever text object
-  # was given as argument into register t
+  # was given as argument into register t. Yank also set marks '[ and ']
   noautocmd execute 'silent normal "ty' .. textobject
-  # save the content of register t into a variable
+
   var text = getreg("t")
-  # restore register t
+  var start_pos = getcharpos("'[")
+  var end_pos = getcharpos("']")
+
+  # restore register t and marks
   setreg("t", oldreg)
-  return text
+  setcharpos("'[", saved_A)
+  setcharpos("']", saved_B)
+
+  return {text: text, start: start_pos, end: end_pos}
 enddef
 
 export def FormatWithoutMoving(a: number = 0, b: number = 0)
@@ -137,17 +145,17 @@ def SurroundSmart(open_delimiter: string,
   var B = getcharpos("'>")
   if !empty(text_object)
     # GetTextObject is called for setting '[ and '] marks through a yank.
-    GetTextObject(text_object)
-    A = getcharpos("'[")
-    B = getcharpos("']")
+    var text_object_dict = GetTextObject(text_object)
+    echom text_object
+    A = text_object_dict.start
+    B = text_object_dict.end
   endif
 
-  # marks -> (x,y) coordinates
-  # line and column
+  # line and column of point A
   var lA = A[1]
   var cA = A[2]
 
-  # line and column
+  # line and column of point B
   var lB = B[1]
   var cB = B[2]
 

test/test_markdown_extras.vim

@@ -165,7 +165,7 @@ def g:Test_check_uncheck_todo_keybinding()
 enddef
 
 def g:Test_Surround_one_line()
-  # vnew
+  vnew
   Generate_markdown_testfile()
   exe $"edit {src_name}"
 

test/test_utils.vim

@@ -204,55 +204,75 @@ def g:Test_IsInRange()
 enddef
 
 def g:Test_GetTextObject()
+  vnew
   Generate_markdown_testfile()
   exe $"edit {src_name}"
 
   # test 'iw'
   cursor(1, 8)
-  var expected_value = 'perspiciatis'
+  var expected_value = {text: 'perspiciatis',
+  start: [0, 1, 8, 0],
+  end: [0, 1, 19, 0],
+  }
+
   var actual_value = utils.GetTextObject('iw')
   assert_equal(expected_value, actual_value)
 
   # test 'iW'
   actual_value = utils.GetTextObject('iW')
   assert_equal(expected_value, actual_value)
 
-  # test 'aw'
-  expected_value = 'perspiciatis '
+  # # test 'aw'
+  expected_value = {text: 'perspiciatis ',
+  start: [0, 1, 8, 0],
+  end: [0, 1, 20, 0],
+  }
   actual_value = utils.GetTextObject('aw')
   assert_equal(expected_value, actual_value)
 
-  # test 'aW'
+  # # test 'aW'
   actual_value = utils.GetTextObject('aW')
   assert_equal(expected_value, actual_value)
 
-  # Test 'i('
+  # # Test 'i('
   cursor(25, 33)
-  expected_value = 'eligendi optio cumque nihil'
+  expected_value = {text: 'eligendi optio cumque nihil',
+  start: [0, 25, 32, 0],
+  end: [0, 25, 58, 0],
+  }
   actual_value = utils.GetTextObject('i(')
   assert_equal(expected_value, actual_value)
 
-  # Test 'yib'
+  # # Test 'yib'
   actual_value = utils.GetTextObject('ib')
   assert_equal(expected_value, actual_value)
 
-  # Test 'a('
-  expected_value = '(eligendi optio cumque nihil)'
+  # # Test 'a('
+  expected_value = {text: '(eligendi optio cumque nihil)',
+  start: [0, 25, 31, 0],
+  end: [0, 25, 59, 0],
+  }
   actual_value = utils.GetTextObject('a(')
   assert_equal(expected_value, actual_value)
 
-  # Test 'ab'
+  # # Test 'ab'
   actual_value = utils.GetTextObject('ab')
   assert_equal(expected_value, actual_value)
 
-  # Test 'i{'
+  # # Test 'i{'
   cursor(28, 25)
-  expected_value = 'rerum necessitatibus'
+  expected_value = {text: 'rerum necessitatibus',
+  start: [0, 28, 23, 0],
+  end: [0, 28, 42, 0],
+  }
   actual_value = utils.GetTextObject('i{')
   assert_equal(expected_value, actual_value)
 
-  # Test 'a{'
-  expected_value = '{rerum necessitatibus}'
+  # # Test 'a{'
+  expected_value = {text: '{rerum necessitatibus}',
+  start: [0, 28, 22, 0],
+  end: [0, 28, 43, 0],
+  }
   actual_value = utils.GetTextObject('a{')
   assert_equal(expected_value, actual_value)
 
@@ -266,11 +286,10 @@ def g:Test_GetTextObject()
   # actual_value = utils.GetTextObject('i"')
   # AssertGetTextObject(expected_value, actual_value)
 
-  :%bw!
-  Cleanup_markdown_testfile()
+  # :%bw!
+  # Cleanup_markdown_testfile()
 enddef
 
-
 def g:Test_DeleteTextBetweenMarks()
   Generate_markdown_testfile()
   exe $"edit {src_name}"