feat: i$ and a$ text objects fallback to next group

refer: #3219

Author: lervag

autoload/vimtex/delim.vim

@@ -453,6 +453,15 @@ function! vimtex#delim#get_surrounding(type) abort " {{{1
         \ : s:get_surrounding_delim(a:type)
 endfunction
 
+" }}}1
+function! vimtex#delim#get_surrounding_or_next(type) abort " {{{1
+  " This is split, because we need some extra conditions to ensure that
+  " delimiters are matched properly.
+  return a:type =~# '^env'
+        \ ? s:get_surrounding_or_next_env(a:type)
+        \ : s:get_surrounding_or_next_delim(a:type)
+endfunction
+
 " }}}1
 
 function! s:get_surrounding_env(type) abort " {{{1
@@ -527,6 +536,34 @@ function! s:get_surrounding_delim(type) abort " {{{1
   return [{}, {}]
 endfunction
 
+" }}}1
+function! s:get_surrounding_or_next_env(type) abort " {{{1
+  let [l:open, l:close] = s:get_surrounding_env(a:type)
+  if !empty(l:open)
+    return [l:open, l:close]
+  endif
+
+  let l:open = vimtex#delim#get_next(a:type, 'open')
+  if empty(l:open) | return [{}, {}] | endif
+
+  let l:close = vimtex#delim#get_matching(l:open)
+  return [l:open, l:close]
+endfunction
+
+" }}}1
+function! s:get_surrounding_or_next_delim(type) abort " {{{1
+  let [l:open, l:close] = s:get_surrounding_delim(a:type)
+  if !empty(l:open)
+    return [l:open, l:close]
+  endif
+
+  let l:next = vimtex#delim#get_next(a:type, 'open')
+  if empty(l:open) | return [{}, {}] | endif
+
+  let l:close = vimtex#delim#get_matching(l:open)
+  return [l:open, l:close]
+endfunction
+
 " }}}1
 
 function! s:operator_setup(operator) abort " {{{1

autoload/vimtex/env.vim

@@ -73,6 +73,25 @@ function! vimtex#env#get_surrounding(type) abort
   endwhile
 endfunction
 
+function! vimtex#env#get_surrounding_or_next(type) abort
+  if a:type ==# 'normal'
+    return vimtex#delim#get_surrounding_or_next('env_tex')
+  endif
+
+  if a:type !=# 'math'
+    call vimtex#log#error('Wrong argument!')
+    return [{}, {}]
+  endif
+
+  " First check for special math env delimiters
+  let [l:open, l:close] = vimtex#delim#get_surrounding_or_next('env_math')
+  if !empty(l:open) | return [l:open, l:close] | endif
+
+  " Finally check for standard math environments
+  let [l:open, l:close] = vimtex#delim#get_surrounding_or_next('env_tex')
+  return [l:open, l:close]
+endfunction
+
 let s:math_envs = [
       \ 'align',
       \ 'alignat',

autoload/vimtex/text_obj.vim

@@ -122,7 +122,7 @@ function! vimtex#text_obj#delimited(is_inner, mode, type) abort " {{{1
     if a:mode
       let l:object = s:get_sel_delimited_visual(a:is_inner, a:type, l:startpos)
     else
-      let [l:open, l:close] = s:get_surrounding(a:type)
+      let [l:open, l:close] = s:get_surrounding_or_next(a:type)
       let l:object = empty(l:open)
             \ ? {} : s:get_sel_delimited(l:open, l:close, a:is_inner)
     endif
@@ -463,6 +463,15 @@ endfunction
 
 " }}}1
 
+function! s:get_surrounding_or_next(type) abort " {{{1
+  if a:type ==# 'delims'
+    return vimtex#delim#get_surrounding_or_next('delim_all')
+  else
+    return vimtex#env#get_surrounding_or_next(a:type)
+  endif
+endfunction
+
+" }}}1
 function! s:get_surrounding(type) abort " {{{1
   if a:type ==# 'delims'
     return vimtex#delim#get_surrounding('delim_all')

test/test-textobj/test-other.vim

@@ -23,4 +23,12 @@ call vimtex#test#keys('f\dac',
       \ 'a + \; f',
       \ 'a +  f')
 
+call vimtex#test#keys('di$',
+      \ 'Hello world! $(x)$',
+      \ 'Hello world! $$')
+
+call vimtex#test#keys('da$',
+      \ 'Hello world! $(x)$',
+      \ 'Hello world! ')
+
 call vimtex#test#finished()