Skip to content

Avoid moving out of brace object in cs and ds #217

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid moving out of brace object in cs and ds #217

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
25 changes: 22 additions & 3 deletions plugin/surround.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ function! s:process(string)
let m = matchstr(a:string,nr2char(i).'.\{-\}\ze'.nr2char(i))
if m != ''
let m = substitute(strpart(m,1),'\r.*','','')
let repl_{i} = input(substitute(m,':\s*$','','').': ')
let repl_{i} = input(match(m,'\w\+$') >= 0 ? m.': ' : m)
endif
endfor
let s = ""
Expand Down Expand Up @@ -394,6 +394,11 @@ function! s:dosurround(...) " {{{1
exe 'norm! dt'.char
else
exe 'norm! d'.strcount.'i'.char
" Note_issue215:
" at this point for [](){}<>, we usually expect cursor to be on the right
" brace. However that won't be the case if the right brace had a newline
" before it and the left brace had text afterward with no newline -- in
" that case, the cursor will be on the left brace. See issue 215.
endif
let keeper = getreg('"')
let okeeper = keeper " for reindent below
Expand All @@ -420,8 +425,22 @@ function! s:dosurround(...) " {{{1
exe 'norm! F'.char
exe 'norm! df'.char
else
" One character backwards
call search('\m.', 'bW')
" One character backwards, except if the cursor is now on the left brace.
" see Note_issue215.
let move_left = 1
let lefts = '[({<'
let rights = '])}>'
let left_i = match(lefts, char)
let right_i = match(rights, char)
if left_i != -1 || right_i != -1
let left = right_i != -1 ? lefts[right_i] : char
if getline('.')[col('.') - 1] == left
let move_left = 0
endif
endif
if move_left
call search('\m.', 'bW')
endif
exe "norm! da".char
endif
let removed = getreg('"')
Expand Down