From f1697631eb8652bd676aaa7c3cb86dbe44ac4323 Mon Sep 17 00:00:00 2001 From: Martin Bielik Date: Tue, 18 Apr 2023 20:17:27 +0200 Subject: seleciton block boundary to eliminate empty response --- autoload/vim_ai.vim | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'autoload/vim_ai.vim') diff --git a/autoload/vim_ai.vim b/autoload/vim_ai.vim index d1c27a9..ac79f3b 100644 --- a/autoload/vim_ai.vim +++ b/autoload/vim_ai.vim @@ -48,7 +48,14 @@ function! s:MakePrompt(is_selection, lines, instruction) let l:lines = trim(join(a:lines, "\n")) let l:instruction = trim(a:instruction) let l:delimiter = l:instruction != "" && a:is_selection ? ":\n" : "" - let l:selection = a:is_selection || l:instruction == "" ? l:lines : "" + let l:selection = "" + if l:instruction == "" + let l:selection = l:lines + elseif a:is_selection + " TODO: check if lines already contain ##### + " NOTE: surround selection with ##### in order to eliminate empty responses + let l:selection = "#####\n" . l:lines . "\n#####" + endif return join([l:instruction, l:delimiter, l:selection], "") endfunction -- cgit v1.2.3 From ec53d91e7f54cb363b4e68a7ed3f03fca8704902 Mon Sep 17 00:00:00 2001 From: Martin Bielik Date: Wed, 19 Apr 2023 19:41:30 +0200 Subject: use selection block only if it is safe --- autoload/vim_ai.vim | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'autoload/vim_ai.vim') diff --git a/autoload/vim_ai.vim b/autoload/vim_ai.vim index ac79f3b..00792dd 100644 --- a/autoload/vim_ai.vim +++ b/autoload/vim_ai.vim @@ -52,9 +52,13 @@ function! s:MakePrompt(is_selection, lines, instruction) if l:instruction == "" let l:selection = l:lines elseif a:is_selection - " TODO: check if lines already contain ##### " NOTE: surround selection with ##### in order to eliminate empty responses - let l:selection = "#####\n" . l:lines . "\n#####" + " TODO: add selection prompt boundary config + if match(l:lines, "#####") != -1 + let l:selection = l:lines + else + let l:selection = "#####\n" . l:lines . "\n#####" + endif endif return join([l:instruction, l:delimiter, l:selection], "") endfunction -- cgit v1.2.3 From e328631901695e5f31b5cdd4eb4b1b955372deb6 Mon Sep 17 00:00:00 2001 From: Martin Bielik Date: Thu, 20 Apr 2023 19:26:56 +0200 Subject: selection boundary config --- autoload/vim_ai.vim | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) (limited to 'autoload/vim_ai.vim') diff --git a/autoload/vim_ai.vim b/autoload/vim_ai.vim index 00792dd..69a0f95 100644 --- a/autoload/vim_ai.vim +++ b/autoload/vim_ai.vim @@ -44,36 +44,42 @@ function! vim_ai#MakeScratchWindow() endif endfunction -function! s:MakePrompt(is_selection, lines, instruction) - let l:lines = trim(join(a:lines, "\n")) - let l:instruction = trim(a:instruction) - let l:delimiter = l:instruction != "" && a:is_selection ? ":\n" : "" +function! s:MakeSelectionPrompt(is_selection, lines, instruction, options) let l:selection = "" - if l:instruction == "" - let l:selection = l:lines + if a:instruction == "" + let l:selection = a:lines elseif a:is_selection - " NOTE: surround selection with ##### in order to eliminate empty responses - " TODO: add selection prompt boundary config - if match(l:lines, "#####") != -1 - let l:selection = l:lines + let l:boundary = a:options['selection_boundary'] + if l:boundary != "" && match(a:lines, l:boundary) == -1 + " NOTE: surround selection with boundary (e.g. #####) in order to eliminate empty responses + let l:selection = l:boundary . "\n" . a:lines . "\n" . l:boundary else - let l:selection = "#####\n" . l:lines . "\n#####" + let l:selection = a:lines endif endif + return l:selection +endfunction + +function! s:MakePrompt(is_selection, lines, instruction, options) + let l:lines = trim(join(a:lines, "\n")) + let l:instruction = trim(a:instruction) + let l:delimiter = l:instruction != "" && a:is_selection ? ":\n" : "" + let l:selection = s:MakeSelectionPrompt(a:is_selection, l:lines, l:instruction, a:options) return join([l:instruction, l:delimiter, l:selection], "") endfunction function! vim_ai#AIRun(is_selection, ...) range + let l:engine = g:vim_ai_complete['engine'] + let l:options = g:vim_ai_complete['options'] + let l:instruction = a:0 ? a:1 : "" let l:lines = getline(a:firstline, a:lastline) - let l:prompt = s:MakePrompt(a:is_selection, l:lines, l:instruction) + let l:prompt = s:MakePrompt(a:is_selection, l:lines, l:instruction, l:options) let s:last_command = "complete" let s:last_instruction = l:instruction let s:last_is_selection = a:is_selection - let l:engine = g:vim_ai_complete['engine'] - let l:options = g:vim_ai_complete['options'] let l:cursor_on_empty_line = trim(join(l:lines, "\n")) == "" set paste if l:cursor_on_empty_line @@ -87,15 +93,16 @@ function! vim_ai#AIRun(is_selection, ...) range endfunction function! vim_ai#AIEditRun(is_selection, ...) range + let l:engine = g:vim_ai_edit['engine'] + let l:options = g:vim_ai_edit['options'] + let l:instruction = a:0 ? a:1 : "" - let l:prompt = s:MakePrompt(a:is_selection, getline(a:firstline, a:lastline), l:instruction) + let l:prompt = s:MakePrompt(a:is_selection, getline(a:firstline, a:lastline), l:instruction, l:options) let s:last_command = "edit" let s:last_instruction = l:instruction let s:last_is_selection = a:is_selection - let l:engine = g:vim_ai_edit['engine'] - let l:options = g:vim_ai_edit['options'] set paste execute "normal! " . a:firstline . "GV" . a:lastline . "Gc" execute "py3file " . s:complete_py @@ -103,6 +110,9 @@ function! vim_ai#AIEditRun(is_selection, ...) range endfunction function! vim_ai#AIChatRun(is_selection, ...) range + let l:options = g:vim_ai_chat['options'] + let l:ui = g:vim_ai_chat['ui'] + let l:instruction = "" let l:lines = getline(a:firstline, a:lastline) set paste @@ -112,7 +122,7 @@ function! vim_ai#AIChatRun(is_selection, ...) range let l:prompt = "" if a:0 || a:is_selection let l:instruction = a:0 ? a:1 : "" - let l:prompt = s:MakePrompt(a:is_selection, l:lines, l:instruction) + let l:prompt = s:MakePrompt(a:is_selection, l:lines, l:instruction, l:options) endif execute "normal! Gi" . l:prompt endif @@ -121,8 +131,6 @@ function! vim_ai#AIChatRun(is_selection, ...) range let s:last_instruction = l:instruction let s:last_is_selection = a:is_selection - let l:options = g:vim_ai_chat['options'] - let l:ui = g:vim_ai_chat['ui'] execute "py3file " . s:chat_py set nopaste endfunction -- cgit v1.2.3