vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

llama.vim : remove on-hold code + fixes [no ci]

Browse source
This commit is contained in:
Georgi Gerganov 2024-10-21 12:32:38 +03:00
parent b8efb0725d
commit 32927e68b7
No known key found for this signature in database
GPG key ID: BF970631944C16B7
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
examples/llama.vim
View file

@ -131,7 +131,7 @@ function! llama#init()
augroup llama augroup llama
autocmd! autocmd!
autocmd InsertEnter * inoremap <expr> <silent> <C-F> llama#fim_inline(v:false, v:false) autocmd InsertEnter * inoremap <expr> <silent> <C-F> llama#fim_inline(v:false)
autocmd InsertLeavePre * call llama#fim_cancel() autocmd InsertLeavePre * call llama#fim_cancel()
autocmd CursorMoved * call s:on_move() autocmd CursorMoved * call s:on_move()
@ -139,9 +139,7 @@ function! llama#init()
autocmd CompleteChanged * call llama#fim_cancel() autocmd CompleteChanged * call llama#fim_cancel()
if g:llama_config.auto_fim if g:llama_config.auto_fim
autocmd InsertEnter * call llama#fim(v:true, v:false) autocmd CursorMovedI * call llama#fim(v:true)
autocmd CursorMovedI * call llama#fim(v:true, v:false)
"autocmd CursorHoldI * call llama#fim(v:true, v:true)
endif endif
" gather chunks upon yanking " gather chunks upon yanking
@ -329,16 +327,17 @@ function! s:ring_update()
endfunction endfunction
" necessary for 'inoremap <expr>' " necessary for 'inoremap <expr>'
function! llama#fim_inline(is_auto, on_hold) abort function! llama#fim_inline(is_auto) abort
call llama#fim(a:is_auto, a:on_hold) call llama#fim(a:is_auto)
return '' return ''
endfunction endfunction
" the main FIM call " the main FIM call
" takes local context around the cursor and sends it together with the extra context to the server for completion " takes local context around the cursor and sends it together with the extra context to the server for completion
function! llama#fim(is_auto, on_hold) abort function! llama#fim(is_auto) abort
" we already have a suggestion for the current cursor position " we already have a suggestion for the current cursor position
if a:on_hold && (s:hint_shown || (s:pos_x == col('.') - 1 && s:pos_y == line('.'))) if s:hint_shown && !a:is_auto
call llama#fim_cancel()
return return
endif endif
@ -352,7 +351,7 @@ function! llama#fim(is_auto, on_hold) abort
endif endif
let s:t_fim_start = reltime() let s:t_fim_start = reltime()
let s:timer_fim = timer_start(600, {-> llama#fim(v:true, v:true)}) let s:timer_fim = timer_start(600, {-> llama#fim(v:true)})
return return
endif endif
@ -512,6 +511,11 @@ function! s:fim_on_stdout(job_id, data, event) dict
return return
endif endif
" show the suggestion only in insert mode
if mode() !=# 'i'
return
endif
let s:pos_x = self.pos_x let s:pos_x = self.pos_x
let s:pos_y = self.pos_y let s:pos_y = self.pos_y