m-vim_plugins/vim-surround
1
0
Fork 0
mirror of https://github.com/tpope/vim-surround.git synced 2025-11-10 20:33:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix edgecase where ds would move the inner text

Browse Source
This commit is contained in:
Tim Pope
2008-01-25 18:31:07 +00:00
parent dff474073c
commit bb456ddcf4
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugin/surround.vim
View File

@@ -424,8 +424,9 @@ function! s:dosurround(...) " {{{1
exe 'norm '.strcount.'[/d'.strcount.']/' exe 'norm '.strcount.'[/d'.strcount.']/'
else else
exe 'norm d'.strcount.'i'.char exe 'norm d'.strcount.'i'.char
" One character backwards
call search('.','bW')
endif endif
"exe "norm vi".char."d"
let keeper = getreg('"') let keeper = getreg('"')
let okeeper = keeper " for reindent below let okeeper = keeper " for reindent below
if keeper == "" if keeper == ""
@@ -436,8 +437,6 @@ function! s:dosurround(...) " {{{1
let oldline = getline('.') let oldline = getline('.')
let oldlnum = line('.') let oldlnum = line('.')
if char ==# "p" if char ==# "p"
"let append = matchstr(keeper,'\n*\%$')
"let keeper = substitute(keeper,'\n*\%$','','')
call setreg('"','','V') call setreg('"','','V')
elseif char ==# "s" || char ==# "w" || char ==# "W" elseif char ==# "s" || char ==# "w" || char ==# "W"
" Do nothing " Do nothing
@@ -450,32 +449,23 @@ function! s:dosurround(...) " {{{1
call setreg('"','/**/',"c") call setreg('"','/**/',"c")
let keeper = substitute(substitute(keeper,'^/\*\s\=','',''),'\s\=\*$','','') let keeper = substitute(substitute(keeper,'^/\*\s\=','',''),'\s\=\*$','','')
else else
exe "norm! da".char exe "norm da".char
endif endif
let removed = getreg('"') let removed = getreg('"')
let rem2 = substitute(removed,'\n.*','','') let rem2 = substitute(removed,'\n.*','','')
let oldhead = strpart(oldline,0,strlen(oldline)-strlen(rem2)) let oldhead = strpart(oldline,0,strlen(oldline)-strlen(rem2))
let oldtail = strpart(oldline, strlen(oldline)-strlen(rem2)) let oldtail = strpart(oldline, strlen(oldline)-strlen(rem2))
let regtype = getregtype('"') let regtype = getregtype('"')
if char == 'p'
let regtype = "V"
endif
if char =~# '[\[({<T]' || spc if char =~# '[\[({<T]' || spc
let keeper = substitute(keeper,'^\s\+','','') let keeper = substitute(keeper,'^\s\+','','')
let keeper = substitute(keeper,'\s\+$','','') let keeper = substitute(keeper,'\s\+$','','')
endif endif
if col("']") == col("$") && col('.') + 1 == col('$') if col("']") == col("$") && col('.') + 1 == col('$')
"let keeper = substitute(keeper,'^\n\s*','','')
"let keeper = substitute(keeper,'\n\s*$','','')
if oldhead =~# '^\s*$' && a:0 < 2 if oldhead =~# '^\s*$' && a:0 < 2
"let keeper = substitute(keeper,oldhead.'\%$','','')
let keeper = substitute(keeper,'\%^\n'.oldhead.'\(\s*.\{-\}\)\n\s*\%$','\1','') let keeper = substitute(keeper,'\%^\n'.oldhead.'\(\s*.\{-\}\)\n\s*\%$','\1','')
endif endif
let pcmd = "p" let pcmd = "p"
else else
if oldhead == "" && a:0 < 2
"let keeper = substitute(keeper,'\%^\n\(.*\)\n\%$','\1','')
endif
let pcmd = "P" let pcmd = "P"
endif endif
if line('.') < oldlnum && regtype ==# "V" if line('.') < oldlnum && regtype ==# "V"
@@ -488,7 +478,6 @@ function! s:dosurround(...) " {{{1
silent exe 'norm! ""'.pcmd.'`[' silent exe 'norm! ""'.pcmd.'`['
if removed =~ '\n' || okeeper =~ '\n' || getreg('"') =~ '\n' if removed =~ '\n' || okeeper =~ '\n' || getreg('"') =~ '\n'
call s:reindent() call s:reindent()
else
endif endif
if getline('.') =~ '^\s\+$' && keeper =~ '^\s*\n' if getline('.') =~ '^\s\+$' && keeper =~ '^\s*\n'
silent norm! cc silent norm! cc