Skip to content

Detect visual blocks too #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jpmelos wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Detect visual blocks too #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion autoload/augment.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function! s:CommandChat(range, args) abort

" If range arguments were provided (when using :Augment chat) or in visual
" mode, get the selected text
if a:range == 2 || mode() ==# 'v' || mode() ==# 'V'
if a:range == 2 || mode() ==# 'v' || mode() ==# 'V' || mode() ==# nr2char(22)
let selected_text = augment#chat#GetSelectedText()
else
let selected_text = ''
Expand Down
22 changes: 14 additions & 8 deletions autoload/augment/chat.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,16 +160,26 @@ function! s:GetBufSelection(line_start, col_start, line_end, col_end) abort
return getline(a:line_start)[a:col_start - 1:a:col_end - 1]
endif

" mode() == 'n' means we're working with Ex mode using marks
if mode() ==# 'n' || mode() ==# 'v' || mode() ==# 'V'
let lines = []
call add(lines, getline(a:line_start)[a:col_start - 1:])
call extend(lines, getline(a:line_start + 1, a:line_end - 1))
call add(lines, getline(a:line_end)[0:a:col_end - 1])
return join(lines, "\n")
endif

" We're in visual block mode
let lines = []
call add(lines, getline(a:line_start)[a:col_start - 1:])
call extend(lines, getline(a:line_start + 1, a:line_end - 1))
call add(lines, getline(a:line_end)[0:a:col_end - 1])
for lnum in range(a:line_start, a:line_end)
call add(lines, getline(lnum)[a:col_start - 1:a:col_end - 1])
endfor
return join(lines, "\n")
endfunction

function! augment#chat#GetSelectedText() abort
" If in visual mode use the current selection
if mode() ==# 'v' || mode() ==# 'V'
if mode() ==# 'v' || mode() ==# 'V' || mode() ==# nr2char(22)
let [line_one, col_one] = getpos('.')[1:2]
let [line_two, col_two] = getpos('v')[1:2]

Expand Down Expand Up @@ -197,10 +207,6 @@ function! augment#chat#GetSelectedText() abort
endif
endif

" . and v return column positions one lower than '< and '>
let col_start += 1
let col_end += 1

" In visual line mode, the columns will be incorrect
if mode() ==# 'V'
let col_start = 1
Expand Down