Consider cmp in pumvisible

andymass · Nov 25, 2023 · 7c4e8a0 · 7c4e8a0
1 parent 269f9be
commit 7c4e8a0
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/autoload/matchup/matchparen.vim b/autoload/matchup/matchparen.vim
@@ -331,7 +331,7 @@ function! s:matchparen.highlight(...) abort dict " {{{1
 
   if has('vim_starting') | return | endif
 
-  if !g:matchup_matchparen_pumvisible && pumvisible() | return | endif
+  if !g:matchup_matchparen_pumvisible && s:pumvisible() | return | endif
 
   " try to avoid interfering with some auto-complete plugins
   if has('*state') && state('a') !=# '' | return | endif
@@ -502,6 +502,18 @@ function s:matchparen.transmute_reset() abort dict
   endif
 endfunction
 
+
+if has('nvim')
+  function s:pumvisible() abort
+    return pumvisible() || luaeval('pcall(require, "cmp")')
+          \ && luaeval('require"cmp".visible()')
+  endfunction
+else
+  function s:pumvisible() abort
+    return pumvisible()
+  endfunction
+endif
+
 " }}}1
 
 function! s:do_popup_autocmd_enter(win_context) abort "{{{1