.

Author: ubaldot

after/ftplugin/markdown.vim

@@ -15,6 +15,8 @@ export var italic_regex = '\v((\\|\*)@<!|(\\\*)@<=)\*\*@!'
 export var bold_regex = '\v(\\|\*)@<!\*\*\*@!'
 export var strikethrough_regex = '\v(\\|\~)@<!\~\~\~@!'
 
+g:A = ['\v(\\|\~)\v@<!\~\~\~@!', '\v(\\|\*)@<!\*\*\*@!', '\v((\\|\*)@<!|(\\\*)@<=)\*\*@!', '\v(\\|`)@<!``@!']
+
 var text_style_dict = {'`': code_regex,
   '*': italic_regex,
   '**': bold_regex,

lib/utils.vim

@@ -14,6 +14,12 @@ 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>): string
+  # Valid only for very-magic regex.
+  return regex_list->map((_, val) => substitute(val, '^\(\\v\)', '', ''))
+          ->join('|')->printf('\v(%s)')
+enddef
+
 export def GetTextObject(textobject: string): string
   # You pass a text object like "iw" and it returns the text
   # associated to it.
@@ -323,26 +329,46 @@ export def GetDelimitersRanges(open_delimiter: string,
   return ranges
 enddef
 
+export def IsGreater(l1: list<number>, l2: list<number>): bool
+    # Compare two list of integers of size 2 based on the first element
+    # return true if l1 > l2
+
+    if l1[0] > l2[0]
+     return true
+    elseif l1[0] == l2[0] && l1[1] > l2[1]
+      return true
+    else
+      return false
+    endif
+enddef
+
+export def IsGreaterEqual(l1: list<number>, l2: list<number>): bool
+    # Compare two list of integers of size 2 based on the first element
+    # return true if l1 >= l2
+
+    if l1[0] > l2[0]
+     return true
+    elseif l1[0] == l2[0] && l1[1] > l2[1]
+      return true
+    elseif l1[0] == l2[0] && l1[1] == l2[1]
+      return true
+    else
+      return false
+    endif
+enddef
+
 export def IsBetweenMarks(A: string, B: string): bool
     var cursor_pos = getpos(".")
-    var A_pos = getcharpos(A)
-    var B_pos = getcharpos(B)
-
-    # Convert in floats of the form "line.column" so the check reduces to a
-    # comparison of floats.
-    var lower_float = str2float($'{A_pos[1]}.{A_pos[2]}')
-    var upper_float = str2float($'{B_pos[1]}.{B_pos[2]}')
-    var cursor_pos_float =
-      str2float($'{getcharpos(".")[1]}.{getcharpos(".")[2]}')
-
-    # In case the lower limit is larger than the higher limit, swap
-    if upper_float < lower_float
-      var tmp = upper_float
-      upper_float = lower_float
-      lower_float = tmp
+    var A_pos = getcharpos(A)[1 : 2]
+    var B_pos = getcharpos(B)[1 : 2]
+
+    if IsGreater(A_pos, B_pos)
+      var tmp = B_pos
+      B_pos = A_pos
+      A_pos = tmp
     endif
 
-    return lower_float <= cursor_pos_float && cursor_pos_float <= upper_float
+    return IsGreaterEqual(cursor_pos, A_pos) && IsGreaterEqual(B_pos, cursor_pos)
 enddef
 
 export def IsInRange(open_delimiter: string,

test/test_utils.vim

@@ -112,6 +112,24 @@ def g:Test_GetDelimitersRanges()
   Cleanup_markdown_testfile()
 enddef
 
+def g:Test_ListComparison()
+  var A = [5, 19]
+  var B = [3, 43]
+  assert_true(utils.IsGreater(A, B))
+  assert_true(utils.IsGreaterEqual(A, B))
+
+  A = [3, 48]
+  B = [3, 21]
+  assert_true(utils.IsGreater(A, B))
+  assert_true(utils.IsGreaterEqual(A, B))
+
+  # Equality
+  A = [3, 48]
+  B = [3, 48]
+  assert_false(utils.IsGreater(A, B))
+  assert_true(utils.IsGreaterEqual(A, B))
+enddef
+
 def g:Test_IsBetweenMarks()
   Generate_markdown_testfile()
   exe $"edit {src_name}"
@@ -273,3 +291,14 @@ def g:Test_ZipList()
   assert_equal(expected_value, actual_value)
 
 enddef
+
+def g:Test_RegexList2RegexOr()
+    var A = '\v(\d+|\a)\s'
+    var B = '\v^\s*\w\d*\w'
+    var C = '\v^\s*\w\d*\w'
+    var test_list = [A, B, C]
+
+    var expected_string = '\v((\d+|\a)\s|^\s*\w\d*\w|^\s*\w\d*\w)'
+    var actual_string = utils.RegexList2RegexOR(test_list)
+    assert_equal(expected_string, actual_string)
+enddef