.

Author: ubaldot

autoload/mde_funcs.vim

@@ -145,6 +145,7 @@ enddef
 export def RemoveAll()
   # TODO could be refactored to increase speed, but it may not be necessary
   const range_info = utils.IsInRange()
+  echom "A: " .. string(range_info)
   const prop_info = highlight.IsOnProp()
   const syn_info = synIDattr(synID(line("."), charcol("."), 1), "name")
   const is_quote_block = getline('.') =~ '^>\s'

autoload/mde_utils.vim

@@ -58,13 +58,16 @@ enddef
 
 export def RemoveSurrounding(range_info: dict<list<list<number>>> = {})
     const style_interval = empty(range_info) ? IsInRange() : range_info
+    echom string(style_interval)
     if !empty(style_interval)
       const style = keys(style_interval)[0]
       const interval = values(style_interval)[0]
 
+      echom "Siamo qui!"
       # Remove left delimiter
       const lA = interval[0][0]
       const cA = interval[0][1]
+      echom $"(lA, cA): ({lA},{cA})"
       const lineA = getline(lA)
       var newline = strcharpart(lineA, 0,
               \ cA - 1 - strchars(constants.TEXT_STYLES_DICT[style].open_delim))
@@ -216,7 +219,7 @@ export def SurroundSmart(style: string, type: string = '')
   # so that all the styles are visible
 
   # Check if A falls in an existing interval
-  cursor(lA, cA)
+  setcursorcharpos(lA, cA)
   var old_right_delimiter = ''
   var found_interval = IsInRange()
   if !empty(found_interval)
@@ -255,7 +258,7 @@ export def SurroundSmart(style: string, type: string = '')
   endif
 
   # Check if B falls in an existing interval
-  cursor(lB, cB)
+  setcursorcharpos(lB, cB)
   var old_left_delimiter = ''
   found_interval = IsInRange()
   if !empty(found_interval)
@@ -427,13 +430,21 @@ export def IsInRange(): dict<list<list<number>>>
     return text_style_refined
   enddef
 
+  def SearchPosChar(pattern: string, options: string): list<number>
+    # Like 'searchpos()' but the column is converted in char index
+    var [l, c] = searchpos(pattern, options)
+    var c_char = strchars(strpart(getline(l), 0, c - 1)) + 1
+    return [l, c_char]
+  enddef
+
   # Main function start here
   # text_style comes from vim-markdown
-  const text_style = synIDattr(synID(line("."), charcol("."), 1), "name")
+  const text_style = synIDattr(synID(line("."), col("."), 1), "name")
+  echom "text_style: " .. text_style
   const text_style_adjusted =
     text_style == 'markdownItalic' || text_style == 'markdownBold'
-     ? StarOrUnderscore(synIDattr(synID(line("."), charcol("."), 1), "name"))
-     : synIDattr(synID(line("."), charcol("."), 1), "name")
+     ? StarOrUnderscore(synIDattr(synID(line("."), col("."), 1), "name"))
+     : synIDattr(synID(line("."), col("."), 1), "name")
   var return_val = {}
 
   if !empty(text_style_adjusted)
@@ -445,38 +456,48 @@ export def IsInRange(): dict<list<list<number>>>
     const open_delim =
       eval($'constants.TEXT_STYLES_DICT.{text_style_adjusted}.open_delim')
 
-    var open_delim_pos = searchpos($'\V{open_delim}', 'bW')
-    var current_style = synIDattr(synID(line("."), charcol("."), 1), "name")
+    # TODO: the searchpos() return a byte index!
+    var open_delim_pos = SearchPosChar($'\V{open_delim}', 'bW')
+
+    # echom $"open_del_pos_back: {open_delim_pos}"
+    var current_style = synIDattr(synID(line("."), col("."), 1), "name")
     # We search for a markdown delimiter or an htmlTag.
     while current_style != $'{text_style}Delimiter'
         && current_style != 'htmlTag'
       && open_delim_pos != [0, 0]
-      open_delim_pos = searchpos($'\V{open_delim}', 'bW')
-      current_style = synIDattr(synID(line("."), charcol("."), 1), "name")
+      open_delim_pos = SearchPosChar($'\V{open_delim}', 'bW')
+      current_style = synIDattr(synID(line("."), col("."), 1), "name")
     endwhile
 
     # To avoid infinite loops if some weird delimited text is highlighted
     if open_delim_pos == [0, 0]
       return {}
     endif
     open_delim_pos[1] += strchars(open_delim)
+    # echom "open del pos_back_plus_delim: " .. string(open_delim_pos)
 
     # Search end delimiter.
     # The end delimiter may be a blank line, hence
     # things become a bit cumbersome.
     setcursorcharpos(saved_curpos[1 : 2])
     const close_delim =
      eval($'constants.TEXT_STYLES_DICT.{text_style_adjusted}.close_delim')
-    var close_delim_pos = searchpos($'\V{close_delim}', 'nW')
-    var blank_line_pos = searchpos($'^$', 'nW')
+    var close_delim_pos = SearchPosChar($'\V{close_delim}', 'W')
+    var blank_line_pos = SearchPosChar('^$', 'W')
     var first_met = [0, 0]
-    current_style = synIDattr(synID(line("."), charcol("."), 1), "name")
+    current_style = synIDattr(synID(line("."), col("."), 1), "name")
+    echom $"close_delim_pos: '{close_delim_pos}'"
+    echom $"blank_line_pos: '{blank_line_pos}'"
 
+    # The while loop is to robustify because you ultimately want to get a
+    # '*Delimiter' text-style, like for example 'markdownBoldDelimiter'
     while current_style != $'{text_style}Delimiter'
         && current_style != 'htmlEndTag'
         && getline(line('.')) !~ '^$'
-      close_delim_pos = searchpos($'\V{close_delim}', 'nW')
-      blank_line_pos = searchpos($'^$', 'nW')
+      close_delim_pos = SearchPosChar($'\V{close_delim}', 'W')
+      blank_line_pos = SearchPosChar('^$', 'W')
+      echom $"close_delim_pos_inside: '{close_delim_pos}'"
+      echom $"blank_line_pos_inside: '{blank_line_pos}'"
       if close_delim_pos == [0, 0]
         first_met = blank_line_pos
       elseif blank_line_pos == [0, 0]
@@ -487,8 +508,9 @@ export def IsInRange(): dict<list<list<number>>>
         : blank_line_pos
       endif
       setcursorcharpos(first_met)
-      current_style = synIDattr(synID(line("."), charcol("."), 1), "name")
+      current_style = synIDattr(synID(line("."), col("."), 1), "name")
     endwhile
+    echom $"first met_before: {first_met}"
 
     # If we hit a blank line, then we take the previous line and last column,
     # to keep consistency in returning open-intervals
@@ -498,6 +520,7 @@ export def IsInRange(): dict<list<list<number>>>
     else
       first_met[1] -= 1
     endif
+    echom $"first met: {first_met}"
 
     setcursorcharpos(saved_curpos[1 : 2])
     return_val =  {[text_style_adjusted]: [open_delim_pos, first_met]}

doc/markdown_extras.txt

@@ -34,7 +34,7 @@ REQUIREMENTS                                    *markdown-extras-requirements*
 Vim 9.0 is required.
 You must set a |localleader| key and your |vimrc| shall include the following
 lines:
->
+>vim
   filetype indent plugin on
   syntax on
 <
@@ -153,7 +153,7 @@ for possible rendering targets. The rendered file will automatically open
 You can also pass arguments to `pandoc` via the key
 `pandoc_args` of the |g:markdown_extras_config| dictionary.
 You could for example set the following:
->
+>vim
   g:markdown_extras_config = {}
   g:markdown_extras_config['pandoc_args'] =
     [$'--css="{$HOME}/dotfiles/my_css_style.css"',
@@ -178,7 +178,7 @@ filling it with he various keys.
                           Default |true|.
         "pandoc_args"     List of arguments to be passed to |compiler-pandoc|.
                           Example:
-                          >
+                          >vim
                           g:markdown_extras_config['pandoc_args'] =
                             ['--css="path/to/my_css_style.css"', '--metadata',
                             'key=value']`
@@ -241,7 +241,7 @@ If such a file does not exists, create it.
 
 For example, to trigger links autocompletion when you hit `[`, add the following
 lines to your `~/.vim/after/ftplugin/markdown.vim` file:
->
+>vim
     setlocal completeopt=menu,menuone,noselect
     import autoload "mde_funcs.vim"
     setlocal omnifunc=mde_funcs.OmniFunc
@@ -264,7 +264,7 @@ COMMANDS                                         *markdown-extras-commands*
 		    plugin.
 
 		    Example:
-		    >
+		    >vim
 		      :MDEIndex  # Uses g:markdown_extras_index
 		      :MDEIndex [
 			    'local/path',
@@ -283,7 +283,7 @@ COMMANDS                                         *markdown-extras-commands*
 			  ]
 <
 		    Or it can be used in a script, like for example:
-		    >
+		    >vim
 		      def Foo()
 			const my_index = {
 			  foo: '/Users/ubaldot/home/Documents/foo.vim',
@@ -316,7 +316,7 @@ MAPPINGS                                         *markdown-extras-mappings*
 
 Note: all the key-bindings that require a motion can also be used in visual
 mode. For example, you can set the following:
->
+>vim
  nnoremap <buffer> B <Plug>MarkdownBold
  xnoremap <buffer> B <Plug>MarkdownBold
 <

test/test_utils.vim

@@ -133,6 +133,19 @@ const lines_2 =<< trim END
        > alias consequatur aut perferendis doloribus asperiores repellat.
 END
 
+const src_name_multibyte = 'multibyte_test.md'
+const lines_multibyte =<< trim END
+当然，这里有一段简短的中文文本：
+
+学习 Vim 是一项非常有趣的挑战。虽然一开始可能感觉有些困难，但只要坚持练习，
+就能够逐渐掌握它强大的功能，并大幅提高编辑效率。
+
+需要**某种特定风格或主题**（比如技术、文学、对话等）吗？
+
+学习 Vim 是一项_非常有趣的挑战。虽然一开始可能感觉有些困难，但只要坚持练习，
+就能够逐渐掌握它强大_的功能，并大幅提高编辑效率。
+END
+
 def Generate_testfile(lines: list<string>, src_name: string)
    writefile(lines, src_name)
 enddef
@@ -173,53 +186,54 @@ def g:Test_IsInRange()
   cursor(1, 27)
   var expected_value = {'markdownBold': [[1, 23], [1, 37]]}
   var range = utils.IsInRange()
-  assert_equal(expected_value, range)
+  echom assert_equal(expected_value, range)
 
   # On the border
   cursor(1, 37)
   range = utils.IsInRange()
   assert_equal(expected_value, range)
 
-  # On the delimiter
+  # # On the delimiter
   cursor(1, 38)
   expected_value = {}
   range = utils.IsInRange()
-  assert_equal(expected_value, range)
+  echom assert_equal(expected_value, range)
 
   cursor(5, 18)
   expected_value = {'markdownItalic': [[4, 18], [5, 29]]}
   range = utils.IsInRange()
   assert_equal(expected_value, range)
 
-  # Test singularity: cursor on a delimiter
+  # # Test singularity: cursor on a delimiter
   cursor(14, 21)
   range = utils.IsInRange()
   assert_true(empty(range))
 
-  # Normal Test
+  # # Normal Test
   cursor(14, 25)
   expected_value = {'markdownBoldU': [[14, 22], [16, 14]]}
   range = utils.IsInRange()
   assert_equal(expected_value, range)
 
-  # End of paragraph with no delimiter
+  # # End of paragraph with no delimiter
   cursor(21, 43)
   expected_value = {'markdownStrike': [[21, 39], [22, 26]]}
+  message clear
   range = utils.IsInRange()
-  assert_equal(expected_value, range)
+  echom assert_equal(expected_value, range)
 
-  cursor(24, 10)
-  expected_value = {}
-  range = utils.IsInRange()
-  assert_equal(expected_value, range)
+  # cursor(24, 10)
+  # expected_value = {}
+  # range = utils.IsInRange()
+  # assert_equal(expected_value, range)
 
-  cursor(31, 18)
-  expected_value = {'markdownLinkText': [[31, 16], [31, 26]]}
-  range = utils.IsInRange()
-  assert_equal(expected_value, range)
+  # cursor(31, 18)
+  # expected_value = {'markdownLinkText': [[31, 16], [31, 26]]}
+  # range = utils.IsInRange()
+  # assert_equal(expected_value, range)
 
-  :%bw!
-  Cleanup_testfile(src_name_1)
+  # :%bw!
+  # Cleanup_testfile(src_name_1)
 enddef
 
 def g:Test_SurroundSimple_one_line()
@@ -641,3 +655,35 @@ def g:Test_unset_quote_block()
   :%bw!
   Cleanup_testfile(src_name_1)
 enddef
+
+def g:Test_multibyte_isInRange()
+  vnew
+  Generate_testfile(lines_multibyte, src_name_multibyte)
+  exe $"edit {src_name_multibyte}"
+  setlocal conceallevel=0
+
+  setcursorcharpos(6, 6)
+  var expected_value = {'markdownBold': [[6, 3], [6, 13]]}
+  var range = utils.IsInRange()
+  echom $"range: {range}"
+  # assert_equal(expected_value, range)
+
+  # setcursorcharpos(8, 28)
+  # expected_value = {'markdownBold': [[8, 12], [9, 10]]}
+  # range = utils.IsInRange()
+  # echom $"{range}"
+enddef
+def g:Test_multibyte_surrounding()
+  vnew
+  Generate_testfile(lines_multibyte, src_name_multibyte)
+  exe $"edit {src_name_multibyte}"
+  setlocal conceallevel=0
+
+  setcursorcharpos(1, 5)
+  setcharpos("'[", [0, 1, 4, 0])
+  setcharpos("']", [0, 1, 15, 0])
+  utils.SurroundSmart('markdownItalicU')
+  var expected_value = '当然，_这里有一段简短的中文文本_：'
+  echom assert_equal(expected_value, getline(1))
+
+enddef