Marks 'Added block surrounding

Author: ubaldot

lib/funcs.vim

@@ -1,6 +1,5 @@
 vim9script
 
-
 export def ToggleMark()
   # Toggle checkbox marks in todo lists
   #
@@ -71,157 +70,3 @@ export def ContinueList()
   startinsert
 
 enddef
-
-# ----------------------------
-# Set-unset code-blocks
-# ----------------------------
-def SetBlockStartEndLines(start_line: number = -1,
-      \ end_line: number = -1): list<number>
-  # Check if the passed lines are valid, or ask for user input
-  # If any of the lines has a negative number, it returns an empty list
-
-  var range_str = ''
-  var l0 = -1
-  var l1 = -1
-
-  # UBA
-  if start_line == -1 || end_line == -1
-    range_str = input('Enter range of the code-block: ')
-    if empty(range_str)
-      return []
-    endif
-    l0 = str2nr(split(range_str, ',')[0])
-    l1 = str2nr(split(range_str, ',')[1])
-    # Lines must be positive
-    if l0 < 1 || l1 < 1
-     return []
-    endif
-  else
-    l0 = start_line
-    l1 = end_line
-  endif
-
-  return [l0, l1]
-enddef
-
-
-
-def SetBlock(tag: string, start_line: number = -1,
-      \  end_line: number = -1, fence: string = '')
-  # This is redundant, the check already happens in ToggleCodeBlock
-  if IsInsideBlock(tag) || getline(line('.')) =~ $'^{tag}'
-    return
-  endif
-
-  # Get actual first and last line of the block
-  var block_range = SetBlockStartEndLines(start_line, end_line)
-  if empty(block_range)
-    return
-  endif
-
-  # TODO Will never happen...
-  var user_fence = 'kbvasLvkbdfkb'
-
-  # If you don't want any language, just set
-  #   g:markdown_extras_config['code_block_language'] = ''
-  #
-  if exists('g:markdown_extras_config') != 0
-      && has_key(g:markdown_extras_config, 'code_block_language')
-    user_fence = g:markdown_extras_config['code_block_language']
-  endif
-
-  if user_fence == 'kbvasLvkbdfkb'
-    user_fence = input('Enter code-block language: ')
-  endif
-
-  var l0 = block_range[0]
-  var l1 = block_range[1]
-
-  # Create block (indenting included)
-  # append(l0 - 1, $'{tag}{user_fence}')
-  append(l0, $'{tag}{user_fence}')
-  # cursor(l0 + 1, 1)
-
-  silent! execute $':{l0 + 1},{l1}s/^\s\+//'
-  silent! execute $':{l0 + 2},{l1}>'
-  append(l1, tag)
-enddef
-
-def UnsetBlock(tag: string)
-  if !IsInsideBlock(tag) || getline(line('.')) =~ $'^{tag}'
-    return
-  else
-    var l0 = search(tag, 'cnb')
-    var l1 = search(tag, 'cn')
-
-    # Remove indent
-    silent! execute $':{l0 + 1},{l1 + 1}s/^\s\+//'
-
-    # Remove tags
-    deletebufline(bufnr('%'), l0)
-    deletebufline(bufnr('%'), l1 - 1)
-  endif
-enddef
-
-
-def GetBlocksRanges(tag: string): list<list<number>>
- # Return a list of lists, where each element delimits a block in the current buffer.
- # E.g. [[38, 33], [46 89]] => two blocks with their range in current buffer
- # Initialize an empty list to store ranges
-  var ranges = []
-
-  # Initialize a variable to keep track of the start line
-  var start_line = -1
-
-  # Loop through each line in the buffer
-  for ii in range(1, line('$'))
-    # Get the current line content
-    var line_content = getline(ii)
-
-    # Check if the line contains the delimiter
-    if line_content =~ tag
-      # If start_line is -1, this is the start of a block
-      if start_line == -1
-        start_line = ii
-      else
-        # Extremes are excluded
-        # This is the end of a block, add the range to the list
-        add(ranges, [start_line, ii])
-        start_line = -1
-      endif
-    endif
-  endfor
-  return ranges
-enddef
-
-# ciai aii aiaia XXX#
-def IsInsideBlock(tag: string): bool
-  var is_inside_block = false
-  var ranges = GetBlocksRanges(tag)
-  var current_line = line('.')
-
-  # Check if inside a block
-  for range in ranges
-    if current_line >= range[0] && current_line <= range[1]
-      is_inside_block = true
-      break
-    endif
-  endfor
-
-  return is_inside_block
-enddef
-
-
-export def ToggleBlock(tag: string, line_start: number = -1,
-      \  line_end: number = -1, fence: string = '')
-  # Set or unset
-  if getline(line('.')) =~ $'^{tag}'
-    return
-  endif
-
-  if !IsInsideBlock(tag)
-    SetBlock(tag, line_start, line_end, fence)
-  else
-    UnsetBlock(tag)
-  endif
-enddef

lib/utils.vim

@@ -570,8 +570,6 @@ export def IsInRange(
 
   # OBS! Ranges are open-intervals!
   var ranges = GetDelimitersRanges(open_delimiter_dict, close_delimiter_dict)
-  echom open_delimiter_dict
-  echom ranges
 
   var saved_mark_a = getcharpos("'a")
   var saved_mark_b = getcharpos("'b")
@@ -606,3 +604,68 @@ export def DeleteTextBetweenMarks(A: string, B: string): string
   # This to get rid off E1186
   return ''
 enddef
+
+
+export def SetBlock(open_block: dict<string>,
+    close_block: dict<string>,
+    motion: string = '')
+  # Put the selected text between open_block and close_block.
+  var label = ''
+  if exists('g:markdown_extras_config') != 0
+      && has_key(g:markdown_extras_config, 'block_label')
+    label = g:markdown_extras_config['block_label']
+  else
+    label = input('Enter code-block language: ')
+  endif
+  echom label
+
+  # TODO return or remove surrounding?
+  if !empty(IsInRange(open_block, close_block))
+      || getline('.') == $'{keys(open_block)[0] .. label}'
+      || getline('.') == $'{keys(close_block)[0]}'
+    return
+  endif
+
+  # Set marks
+  var A = getcharpos("'<")
+  var B = getcharpos("'>")
+  if !empty(motion)
+    # GetTextObject is called for setting '[ and '] marks through a yank.
+    var motion_dict = GetTextObject(motion)
+    A = motion_dict.start
+    B = motion_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]
+
+  # TODO: may be not needed
+  if A == B
+    return
+  endif
+
+  var firstline = getline(lA)
+  var lastline = getline(lB)
+  # Set first part
+  setline(lA, strcharpart(getline(lA), 0, cA - 1))
+  append(lA, [$'{keys(open_block)[0] .. label}',
+    "  " .. strcharpart(firstline, cA - 1)])
+  lA += 2
+  lB += 2
+
+  # Set intermediate part
+  var ii = 1
+  while lA + ii <= lB
+    setline(lA + ii, "  " .. getline(lA + ii)->substitute('^\s*', '', ''))
+    ii += 1
+  endwhile
+
+  # Set last part
+  setline(lB, "  " .. strcharpart(lastline, 0, cB))
+  append(lB, [$'{keys(close_block)[0]}', strcharpart(lastline, cB)])
+enddef

test/test_utils.vim

@@ -431,9 +431,10 @@ def g:Test_SurroundSimple_one_line()
   ]
   utils.SurroundSimple('**', '**', text_style_dict, text_style_dict)
   actual_value = getline(20, 22)
-  echom actual_value
-  echom assert_equal(expected_value, actual_value)
+  assert_equal(expected_value, actual_value)
 
+  cursor(19, 53)
+  utils.SurroundSimple('*', '*', text_style_dict, text_style_dict, 'iw')
   :%bw!
   Cleanup_testfile(src_name_2)
 enddef
@@ -496,6 +497,20 @@ def g:Test_SurroundSmart_one_line()
     ]
   cursor(15, 13)
   utils.SurroundSmart('**', '**', text_style_dict, text_style_dict, 'a(')
+  # Do the same operation, nothing should change
+  utils.SurroundSmart('**', '**', text_style_dict, text_style_dict, 'a(')
+  actual_value = getline(14, 16)
+  assert_equal(expected_value, actual_value)
+
+  # Prolong delimiter
+  expected_value = [
+    'Quis autem vel eum iure reprehenderit qui in ea **voluptate velit esse**',
+    'quam nihil **(molestiae consequatur), vel** illum qui dolorem eum fugiat quo',
+    'voluptas nulla pariatur?',
+    ]
+  cursor(15, 32)
+  exe "norm! veee\<esc>"
+  utils.SurroundSmart('**', '**', text_style_dict, text_style_dict)
   actual_value = getline(14, 16)
   assert_equal(expected_value, actual_value)
 
@@ -640,7 +655,7 @@ def g:Test_RemoveSurrounding_multi_line()
   cursor(28, 25)
   utils.RemoveSurrounding(code_dict, code_dict)
   var actual_value = getline(28, 30)
-  echom assert_equal(expected_value, actual_value)
+  assert_equal(expected_value, actual_value)
 
   # Test 2: preserve inner surrounding
   expected_value = [
@@ -650,7 +665,62 @@ def g:Test_RemoveSurrounding_multi_line()
   cursor(32, 28)
   utils.RemoveSurrounding(italic_dict, italic_dict)
   actual_value = getline(32, 33)
-  echom assert_equal(expected_value, actual_value)
+  assert_equal(expected_value, actual_value)
+
+  :%bw!
+  Cleanup_testfile(src_name_2)
+enddef
+
+
+def g:Test_code_block()
+  vnew
+  Generate_testfile(lines_2, src_name_2)
+  exe $"edit {src_name_2}"
+
+  g:markdown_extras_config = {}
+  g:markdown_extras_config['block_label'] = ''
+
+  var expected_value = [
+    'ab illo inventore veritatis ',
+    '```',
+    '  et quasi architecto beatae vitae dicta',
+    '  sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit',
+    '  aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos',
+    '  qui ratione voluptatem sequi ',
+    '```',
+    'nesciunt.',
+    ]
+  cursor(3, 29)
+  exe "norm! v3j\<esc>"
+  utils.SetBlock(codeblock_dict, codeblock_dict)
+  var actual_value = getline(3, 10)
+  assert_equal(expected_value, actual_value)
+
+  # Check that it won't undo
+  cursor(6, 10)
+  utils.SetBlock(codeblock_dict, codeblock_dict)
+  assert_equal(expected_value, actual_value)
+
+  # Check that it won't undo when on the border
+  cursor(4, 2)
+  utils.SetBlock(codeblock_dict, codeblock_dict)
+  assert_equal(expected_value, actual_value)
+
+  # check with motion
+  expected_value = [
+    '```',
+    '  Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet,',
+    '  consectetur, adipisci velit, sed quia non numquam eius modi tempora',
+    '  incidunt ut (labore et ~~dolore magnam) aliquam quaerat~~ voluptatem. Ut',
+    '  enim ad `minima [veniam`, quis no~~strum] exercitationem~~ ullam corporis',
+    '```',
+    ]
+  cursor(12, 1)
+  utils.SetBlock(codeblock_dict, codeblock_dict, '3j')
+  actual_value = getline(13, 18)
+  assert_equal(expected_value, actual_value)
+
+  unlet g:markdown_extras_config
 
   :%bw!
   Cleanup_testfile(src_name_2)