mirror of
https://github.com/vim/vim.git
synced 2025-10-08 06:04:08 -04:00
patch 8.2.1984: cannot use :vimgrep in omni completion
Problem: Cannot use :vimgrep in omni completion, causing C completion to fail. Solution: Add the EX_LOCK_OK flag to :vimgrep. (closes #7292)
This commit is contained in:
@@ -929,10 +929,10 @@ EXCMD(CMD_luafile, "luafile", ex_luafile,
|
|||||||
EX_RANGE|EX_FILE1|EX_NEEDARG|EX_CMDWIN|EX_LOCK_OK|EX_RESTRICT,
|
EX_RANGE|EX_FILE1|EX_NEEDARG|EX_CMDWIN|EX_LOCK_OK|EX_RESTRICT,
|
||||||
ADDR_LINES),
|
ADDR_LINES),
|
||||||
EXCMD(CMD_lvimgrep, "lvimgrep", ex_vimgrep,
|
EXCMD(CMD_lvimgrep, "lvimgrep", ex_vimgrep,
|
||||||
EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE,
|
EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE|EX_LOCK_OK,
|
||||||
ADDR_OTHER),
|
ADDR_OTHER),
|
||||||
EXCMD(CMD_lvimgrepadd, "lvimgrepadd", ex_vimgrep,
|
EXCMD(CMD_lvimgrepadd, "lvimgrepadd", ex_vimgrep,
|
||||||
EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE,
|
EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE|EX_LOCK_OK,
|
||||||
ADDR_OTHER),
|
ADDR_OTHER),
|
||||||
EXCMD(CMD_lwindow, "lwindow", ex_cwindow,
|
EXCMD(CMD_lwindow, "lwindow", ex_cwindow,
|
||||||
EX_RANGE|EX_COUNT|EX_TRLBAR,
|
EX_RANGE|EX_COUNT|EX_TRLBAR,
|
||||||
@@ -1673,10 +1673,10 @@ EXCMD(CMD_view, "view", ex_edit,
|
|||||||
EX_BANG|EX_FILE1|EX_CMDARG|EX_ARGOPT|EX_TRLBAR,
|
EX_BANG|EX_FILE1|EX_CMDARG|EX_ARGOPT|EX_TRLBAR,
|
||||||
ADDR_NONE),
|
ADDR_NONE),
|
||||||
EXCMD(CMD_vimgrep, "vimgrep", ex_vimgrep,
|
EXCMD(CMD_vimgrep, "vimgrep", ex_vimgrep,
|
||||||
EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE,
|
EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE|EX_LOCK_OK,
|
||||||
ADDR_OTHER),
|
ADDR_OTHER),
|
||||||
EXCMD(CMD_vimgrepadd, "vimgrepadd", ex_vimgrep,
|
EXCMD(CMD_vimgrepadd, "vimgrepadd", ex_vimgrep,
|
||||||
EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE,
|
EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE|EX_LOCK_OK,
|
||||||
ADDR_OTHER),
|
ADDR_OTHER),
|
||||||
EXCMD(CMD_vim9script, "vim9script", ex_vim9script,
|
EXCMD(CMD_vim9script, "vim9script", ex_vim9script,
|
||||||
EX_CMDWIN|EX_LOCK_OK,
|
EX_CMDWIN|EX_LOCK_OK,
|
||||||
|
@@ -3091,6 +3091,66 @@ func Test_resize_from_copen()
|
|||||||
endtry
|
endtry
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_vimgrep_with_textlock()
|
||||||
|
new
|
||||||
|
|
||||||
|
" Simple way to execute something with "textwinlock" set.
|
||||||
|
" Check that vimgrep without jumping can be executed.
|
||||||
|
au InsertCharPre * vimgrep /RunTheTest/j runtest.vim
|
||||||
|
normal ax
|
||||||
|
let qflist = getqflist()
|
||||||
|
call assert_true(len(qflist) > 0)
|
||||||
|
call assert_match('RunTheTest', qflist[0].text)
|
||||||
|
call setqflist([], 'r')
|
||||||
|
au! InsertCharPre
|
||||||
|
|
||||||
|
" Check that vimgrepadd without jumping can be executed.
|
||||||
|
au InsertCharPre * vimgrepadd /RunTheTest/j runtest.vim
|
||||||
|
normal ax
|
||||||
|
let qflist = getqflist()
|
||||||
|
call assert_true(len(qflist) > 0)
|
||||||
|
call assert_match('RunTheTest', qflist[0].text)
|
||||||
|
call setqflist([], 'r')
|
||||||
|
au! InsertCharPre
|
||||||
|
|
||||||
|
" Check that lvimgrep without jumping can be executed.
|
||||||
|
au InsertCharPre * lvimgrep /RunTheTest/j runtest.vim
|
||||||
|
normal ax
|
||||||
|
let qflist = getloclist(0)
|
||||||
|
call assert_true(len(qflist) > 0)
|
||||||
|
call assert_match('RunTheTest', qflist[0].text)
|
||||||
|
call setloclist(0, [], 'r')
|
||||||
|
au! InsertCharPre
|
||||||
|
|
||||||
|
" Check that lvimgrepadd without jumping can be executed.
|
||||||
|
au InsertCharPre * lvimgrepadd /RunTheTest/j runtest.vim
|
||||||
|
normal ax
|
||||||
|
let qflist = getloclist(0)
|
||||||
|
call assert_true(len(qflist) > 0)
|
||||||
|
call assert_match('RunTheTest', qflist[0].text)
|
||||||
|
call setloclist(0, [], 'r')
|
||||||
|
au! InsertCharPre
|
||||||
|
|
||||||
|
" trying to jump will give an error
|
||||||
|
au InsertCharPre * vimgrep /RunTheTest/ runtest.vim
|
||||||
|
call assert_fails('normal ax', 'E565:')
|
||||||
|
au! InsertCharPre
|
||||||
|
|
||||||
|
au InsertCharPre * vimgrepadd /RunTheTest/ runtest.vim
|
||||||
|
call assert_fails('normal ax', 'E565:')
|
||||||
|
au! InsertCharPre
|
||||||
|
|
||||||
|
au InsertCharPre * lvimgrep /RunTheTest/ runtest.vim
|
||||||
|
call assert_fails('normal ax', 'E565:')
|
||||||
|
au! InsertCharPre
|
||||||
|
|
||||||
|
au InsertCharPre * lvimgrepadd /RunTheTest/ runtest.vim
|
||||||
|
call assert_fails('normal ax', 'E565:')
|
||||||
|
au! InsertCharPre
|
||||||
|
|
||||||
|
bwipe!
|
||||||
|
endfunc
|
||||||
|
|
||||||
" Tests for the quickfix buffer b:changedtick variable
|
" Tests for the quickfix buffer b:changedtick variable
|
||||||
func Xchangedtick_tests(cchar)
|
func Xchangedtick_tests(cchar)
|
||||||
call s:setup_commands(a:cchar)
|
call s:setup_commands(a:cchar)
|
||||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1984,
|
||||||
/**/
|
/**/
|
||||||
1983,
|
1983,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user