Added syntax on to the dummy file

Author: ubaldot

lib/constants.vim

@@ -110,7 +110,7 @@ export const STRIKE_CLOSE_DICT = {[TEXT_STYLES_DICT.markdownStrike.close_delim]:
 export const LINK_OPEN_DICT = {[TEXT_STYLES_DICT.markdownLinkText.open_delim]:
   TEXT_STYLES_DICT.markdownLinkText.open_regex}
 export const LINK_CLOSE_DICT = {[TEXT_STYLES_DICT.markdownLinkText.close_delim]:
-  TEXT_STYLES_DICT.markdownStrike.close_regex}
+  TEXT_STYLES_DICT.markdownLinkText.close_regex}
 
 # TODO on the delimiter synIDattr(synID(line("."), col("."), 1), "name")
 # return markdownCodeDelimiter instead of

lib/utils.vim

@@ -2,7 +2,6 @@ vim9script
 
 import autoload "./constants.vim"
 
-
 export def Echoerr(msg: string)
   echohl ErrorMsg | echom $'[markdown_extras] {msg}' | echohl None
 enddef
@@ -11,7 +10,6 @@ export def Echowarn(msg: string)
   echohl WarningMsg | echom $'[markdown_extras] {msg}' | echohl None
 enddef
 
-
 export def FormatWithoutMoving(a: number = 0, b: number = 0)
   # To be used for formatting through autocmds
   var view = winsaveview()
@@ -238,12 +236,11 @@ export def SurroundSmart(style: string, type: string = '')
     if style != 'markdownCode'
       A_to_B = A_to_B->substitute($'\V{join(delimiters_to_remove, '\|')}', '', 'g')
     endif
-    # echom "A_to_B: " .. A_to_B
 
-    echom $'toA: ' .. toA
-    echom $'fromB: ' .. fromB
-    echom $'A_to_B:' .. A_to_B
-    echom '----------\n'
+    # echom $'toA: ' .. toA
+    # echom $'fromB: ' .. fromB
+    # echom $'A_to_B:' .. A_to_B
+    # echom '----------\n'
 
     # Set the whole line
     setline(lA, toA .. A_to_B .. fromB)
@@ -381,7 +378,6 @@ export def IsBetweenMarks(A: string, B: string): bool
     return result
 enddef
 
-
 export def IsInRange(): dict<list<list<number>>>
   # Return a dict like {'markdownCode': [[21, 19], [22, 21]]}.
   # The returned intervals are open.
@@ -414,38 +410,69 @@ export def IsInRange(): dict<list<list<number>>>
   enddef
 
   # Main function start here
-  const text_style =
-    synIDattr(synID(line("."), col("."), 1), "name") == 'markdownItalic'
-    || synIDattr(synID(line("."), col("."), 1), "name") == 'markdownBold'
+  # text_style comes from vim-markdown
+  const text_style = synIDattr(synID(line("."), col("."), 1), "name")
+  const text_style_adjusted =
+    text_style == 'markdownItalic' || text_style == 'markdownBold'
      ? StarOrUnderscore(synIDattr(synID(line("."), col("."), 1), "name"))
      : synIDattr(synID(line("."), col("."), 1), "name")
   var return_val = {}
 
-  if !empty(text_style)
-      && index(keys(constants.TEXT_STYLES_DICT), text_style) != -1
+  if !empty(text_style_adjusted)
+      && index(keys(constants.TEXT_STYLES_DICT), text_style_adjusted) != -1
+
+    const saved_curpos = getcursorcharpos()
 
     # Search start delimiter
     const open_delim =
-      eval($'constants.TEXT_STYLES_DICT.{text_style}.open_delim')
-    const open_regex =
-      eval($'constants.TEXT_STYLES_DICT.{text_style}.open_regex')
-    var start_delim = searchpos(open_regex, 'nbW')
-    start_delim[1] += len(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("."), col("."), 1), "name")
+    while current_style != $'{text_style}Delimiter'
+      open_delim_pos = searchpos($'\V{open_delim}', 'bW')
+      current_style = synIDattr(synID(line("."), col("."), 1), "name")
+    endwhile
+    open_delim_pos[1] += len(open_delim)
 
-    # Search end delimiter
+    # 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}.close_delim')
-    const close_regex =
-      eval($'constants.TEXT_STYLES_DICT.{text_style}.close_regex')
-    var end_delim = searchpos(close_regex, 'ncW')
-
-    # TODO: Very ugly hack due to the LINK_CLOSE_REGEX ending up on ]
-    if synIDattr(synID(end_delim[0], end_delim[1], 1), "name")
-        == 'markdownLinkTextDelimiter'
-      end_delim[1] -= 1
+     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 first_met = [0, 0]
+    current_style = synIDattr(synID(line("."), col("."), 1), "name")
+
+    while current_style != $'{text_style}Delimiter'
+        && getline(line('.')) !~ '^$'
+      close_delim_pos = searchpos($'\V{close_delim}', 'nW')
+      blank_line_pos = searchpos($'^$', 'nW')
+      if close_delim_pos == [0, 0]
+        first_met = blank_line_pos
+      elseif blank_line_pos == [0, 0]
+        first_met = close_delim_pos
+      else
+        first_met = IsLess(close_delim_pos, blank_line_pos)
+        ? close_delim_pos
+        : blank_line_pos
+      endif
+      setcursorcharpos(first_met)
+      current_style = synIDattr(synID(line("."), col("."), 1), "name")
+    endwhile
+
+    # If we hit a blank line, then we take the previous line and last column,
+    # to keep consistency in returning open-intervals
+    if getline(line('.')) =~ '^$'
+      first_met[0] = first_met[0] - 1
+      first_met[1] = len(getline(first_met[0]))
+    else
+      first_met[1] -= 1
     endif
 
-    return_val =  {[text_style]: [start_delim, end_delim]}
+    setcursorcharpos(saved_curpos[1 : 2])
+    return_val =  {[text_style_adjusted]: [open_delim_pos, first_met]}
   endif
 
   return return_val

test/run_tests.cmd

@@ -16,9 +16,11 @@ REM
     echo set runtimepath+=..
     echo set runtimepath+=../after
     echo filetype plugin indent on
+    echo syntax on
 ) >> "%VIMRC%"
 
-SET "VIM_CMD=%VIMPRG% --clean -u %VIMRC% -i NONE --not-a-term"
+REM SET "VIM_CMD=%VIMPRG% --clean -u %VIMRC% -i NONE --not-a-term"
+SET "VIM_CMD=%VIMPRG% --clean -u %VIMRC% -i NONE"
 
 REM Check if the vimrc file was created successfully
 if NOT EXIST "%VIMRC%" (
@@ -33,7 +35,8 @@ type "%VIMRC%"
 echo/
 
 REM Run Vim with the specified configuration and additional commands
-SET "TEST_FILES=['test_markdown_extras.vim', 'test_utils.vim', 'test_regex.vim']"
+REM SET "TEST_FILES=['test_markdown_extras.vim', 'test_utils.vim', 'test_regex.vim']"
+SET "TEST_FILES=['test_utils.vim']"
 %VIM_CMD% -c "vim9cmd g:TestFiles =  %TEST_FILES%" -S "runner.vim"
 REM If things go wrong uncomment the following line and see e.g. if the
 REM vimrc_for_test is valid, check :messages and so on.

test/run_tests.sh

@@ -27,7 +27,8 @@ echo "vim9script" > "$VIMRC"
 echo "">> "$VIMRC"
 echo "set runtimepath+=.." >> "$VIMRC"
 echo "set runtimepath+=../after"  >> "$VIMRC"
-echo "filetype plugin on" >> "$VIMRC"
+echo "filetype indent plugin on" >> "$VIMRC"
+echo "syntax on" >> "$VIMRC"
 
 # Display vimrc content
 echo "----- vimrc content ---------"

test/test_regex.vim

@@ -301,15 +301,16 @@ def g:Test_links_regex()
   for ii in range(len(curpos))
     cursor(curpos[ii])
     actual_pos = searchpos(LINK_OPEN_REGEX, 'bW')
-    echom actual_pos
     echom assert_equal(expected_pos_open[ii], actual_pos)
 
     # Close
     cursor(curpos[ii])
     actual_pos = searchpos(LINK_CLOSE_REGEX, 'cW')
+    echom LINK_CLOSE_REGEX
+    echom actual_pos
     echom assert_equal(expected_pos_close[ii], actual_pos)
   endfor
 
-  :%bw!
-  Cleanup_testfile(src_name_2)
+  # :%bw!
+  # Cleanup_testfile(src_name_2)
 enddef

test/test_utils.vim

@@ -157,7 +157,6 @@ def g:Test_ListComparison()
   assert_false(utils.IsGreater(A, B))
   assert_false(utils.IsLess(A, B))
   assert_true(utils.IsEqual(A, B))
-
 enddef
 
 def g:Test_IsInRange()
@@ -201,7 +200,7 @@ def g:Test_IsInRange()
 
   # End of paragraph with no delimiter
   cursor(21, 43)
-  expected_value = {'markdownStrike': [[21, 39], [23, 1]]}
+  expected_value = {'markdownStrike': [[21, 39], [22, 26]]}
   range = utils.IsInRange()
   echom assert_equal(expected_value, range)
 
@@ -388,8 +387,8 @@ def g:Test_SurroundSmart_one_line_1()
   actual_value = getline(18, 20)
   echom assert_equal(expected_value, actual_value)
 
-  :%bw!
-  Cleanup_testfile(src_name_2)
+  # :%bw!
+  # Cleanup_testfile(src_name_2)
 enddef
 
 def g:Test_RemoveSurrounding_one_line()