forked from aniani/vim
patch 8.2.3223: Vim: using {} block in autoloade omnifunc fails
Problem: Vim: using {} block in autoloade omnifunc fails. Solution: Allow using {} block when text is locked. (closes #8631)
This commit is contained in:
parent
3c77b6a1ce
commit
ff34bee3a2
@ -1853,7 +1853,7 @@ EXCMD(CMD_at, "@", ex_at,
|
|||||||
EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK|EX_NONWHITE_OK,
|
EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK|EX_NONWHITE_OK,
|
||||||
ADDR_LINES),
|
ADDR_LINES),
|
||||||
EXCMD(CMD_block, "{", ex_block, // not found normally
|
EXCMD(CMD_block, "{", ex_block, // not found normally
|
||||||
EX_TRLBAR,
|
EX_TRLBAR|EX_LOCK_OK,
|
||||||
ADDR_NONE),
|
ADDR_NONE),
|
||||||
EXCMD(CMD_endblock, "}", ex_endblock,
|
EXCMD(CMD_endblock, "}", ex_endblock,
|
||||||
EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
|
EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
|
||||||
|
@ -121,6 +121,37 @@ func Test_omni_dash()
|
|||||||
set omnifunc=
|
set omnifunc=
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_omni_autoload()
|
||||||
|
let save_rtp = &rtp
|
||||||
|
set rtp=Xruntime/some
|
||||||
|
let dir = 'Xruntime/some/autoload'
|
||||||
|
call mkdir(dir, 'p')
|
||||||
|
|
||||||
|
let lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
def omni#func(findstart: bool, base: string): any
|
||||||
|
if findstart
|
||||||
|
return 1
|
||||||
|
else
|
||||||
|
return ['match']
|
||||||
|
endif
|
||||||
|
enddef
|
||||||
|
{
|
||||||
|
eval 1 + 2
|
||||||
|
}
|
||||||
|
END
|
||||||
|
call writefile(lines, dir .. '/omni.vim')
|
||||||
|
|
||||||
|
new
|
||||||
|
setlocal omnifunc=omni#func
|
||||||
|
call feedkeys("i\<C-X>\<C-O>\<Esc>", 'xt')
|
||||||
|
|
||||||
|
bwipe!
|
||||||
|
call delete('Xruntime', 'rf')
|
||||||
|
set omnifunc=
|
||||||
|
let &rtp = save_rtp
|
||||||
|
endfunc
|
||||||
|
|
||||||
func Test_completefunc_args()
|
func Test_completefunc_args()
|
||||||
let s:args = []
|
let s:args = []
|
||||||
func! CompleteFunc(findstart, base)
|
func! CompleteFunc(findstart, base)
|
||||||
|
@ -755,6 +755,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 */
|
||||||
|
/**/
|
||||||
|
3223,
|
||||||
/**/
|
/**/
|
||||||
3222,
|
3222,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user