Fix not to break code finding with parentheses in comment #277

autoload/iced/paredit.vim

@@ -113,13 +113,17 @@ function! iced#paredit#get_current_top_object_raw(...) abort
 
         call setpos('.', start_pos)
         " move to pair
-        silent normal! %
+        " NOTE: `%` may be matched to parentheses in comment block without matchit.vim
+        silent exe "normal \<Plug>(sexp_move_to_next_bracket)"
         let end_pos = getcurpos()
 
         if s:is_in_range(pos, start_pos, end_pos)
+          " select end_pos to start_pos
+          call setpos('.', end_pos)
+          silent exe 'normal! v'
           call setpos('.', start_pos)
-          " NOTE: `o0y` is to wrap top level tag literal
-          silent exe printf('normal! va%so0y', open_char)
+          " NOTE: `0` is to wrap top level tag literal
+          silent exe 'normal! 0y'
 
           let result = {
                \ 'code': @@,

test/helper/autoload/themis/helper/iced_buffer.vim

@@ -9,6 +9,11 @@ function! s:helper.start_dummy(lines) abort
   setl nobuflisted
   setl filetype=clojure
 
+  " copy from runtime/syntax/clojure.vim
+  " required by <Plug>(sexp_move_to_next_bracket)
+  syntax match clojureComment ";.*$"
+  syntax match clojureComment "#!.*$"
+
   let i = 1
   let cursor_pos = [1, 1]
   for line in a:lines

test/paredit.vim

@@ -5,6 +5,9 @@ let s:buf = themis#helper('iced_buffer')
 let s:ch = themis#helper('iced_channel')
 let s:funcs = s:scope.funcs('autoload/iced/nrepl.vim')
 
+let g:iced_enable_clj_kondo_analysis = v:false
+let g:iced_cache_directory = ''
+
 function! s:format_code_relay(msg) abort
   if a:msg['op'] ==# 'iced-format-code-with-indents'
     return {'status': ['done'], 'formatted': a:msg['code']}
@@ -73,6 +76,17 @@ function! s:suite.get_current_top_object_with_tag_test() abort
   call s:buf.stop_dummy()
 endfunction
 
+function! s:suite.get_current_top_object_with_comment_test() abort
+  call s:buf.start_dummy([
+        \ '(foo',
+        \ ' ;; baz)',
+        \ ' (bar|))',
+        \ ])
+  let res = iced#paredit#get_current_top_object()
+  call s:assert.equals(res['code'], "(foo\n ;; baz)\n (bar))")
+  call s:buf.stop_dummy()
+endfunction
+
 function! s:suite.move_to_current_element_head_test() abort
   call s:buf.start_dummy(['(foo (bar (baz|)))'])
   call s:assert.equals(col('.'), 15)