m-vim_plugins/vim-surround
1
0
Fork 0
mirror of https://github.com/tpope/vim-surround.git synced 2025-11-15 23:03:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaned up; added blockwise visual mode support

Browse Source
This commit is contained in:
Tim Pope
2006-10-31 02:02:17 +00:00
parent f06d809973
commit 6c639ccfd4
1 changed files with 129 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

229
plugin/surround.vim
View File

@@ -70,10 +70,13 @@
" "
" In visual mode, a simple "s" with an argument wraps the selection. This is " In visual mode, a simple "s" with an argument wraps the selection. This is
" referred to as the *vs* mapping, although ordinarily there will be " referred to as the *vs* mapping, although ordinarily there will be
" additional keystrokes between the v and s. Note that "s" already has a " additional keystrokes between the v and s. In linewise visual mode, the
" valid meaning in visual mode, but it is identical to "c". If you have " surroundings are placed on separate lines. In blockwise visual mode, each
" muscle memory for "s" and would like to use a different key, add your own " line is surrounded.
" mapping and the existing one will be disabled. "
" Note that "s" already has a valid meaning in visual mode, but it is
" identical to "c". If you have muscle memory for "s" and would like to use a
" different key, add your own mapping and the existing one will be disabled.
" > " >
" vmap S <Plug>Vsurround " vmap S <Plug>Vsurround
" < " <
@@ -130,7 +133,8 @@
" "
" If t or < is used, Vim prompts for an HTML/XML tag to insert. You may " If t or < is used, Vim prompts for an HTML/XML tag to insert. You may
" specify attributes here and they will be stripped from the closing tag. " specify attributes here and they will be stripped from the closing tag.
" End your input by pressing <CR> or >. " End your input by pressing <CR> or >. As an experimental feature, if , or
" <C-T> is used, the tags will appear on lines by themselves.
" "
" An experimental replacement of a LaTeX environment is provided on \ and l. " An experimental replacement of a LaTeX environment is provided on \ and l.
" The name of the environment and any arguments will be input from a prompt. " The name of the environment and any arguments will be input from a prompt.
@@ -299,19 +303,18 @@ endfunction
function! s:fixindent(str,spc) function! s:fixindent(str,spc)
let str = substitute(a:str,'\t',s:repeat(' ',&sw),'g') let str = substitute(a:str,'\t',s:repeat(' ',&sw),'g')
let spc = substitute(a:spc,'\t',s:repeat(' ',&sw),'g') let spc = substitute(a:spc,'\t',s:repeat(' ',&sw),'g')
let str = substitute(str,'\n.\@=','\n'.spc,'g') let str = substitute(str,'\(\n\|\%^\).\@=','\1'.spc,'g')
if ! &et if ! &et
let str = substitute('\s\{'.&ts.'\}',"\t",'g') let str = substitute('\s\{'.&ts.'\}',"\t",'g')
endif endif
return str return str
endfunction endfunction
let g:surround_35 = "<%\n\t\r\n%>"
function! s:wrap(string,char,...) function! s:wrap(string,char,...)
let keeper = a:string let keeper = a:string
let newchar = a:char let newchar = a:char
let linemode = a:0 ? a:1 : 0 let type = a:0 ? (a:1 == 1 ? 'V' : a:1 ) : 'v'
let linemode = type ==# 'V' ? 1 : 0
let before = "" let before = ""
let after = "" let after = ""
if linemode if linemode
@@ -336,7 +339,7 @@ function! s:wrap(string,char,...)
elseif newchar ==# "p" elseif newchar ==# "p"
let before = "\n" let before = "\n"
let after = "\n\n" let after = "\n\n"
elseif newchar ==# "t" || newchar ==# "T" || newchar == "<" elseif newchar =~# "[tT\<C-T><,]"
"let dounmapr = 0 "let dounmapr = 0
let dounmapb = 0 let dounmapb = 0
"if !mapcheck("<CR>","c") "if !mapcheck("<CR>","c")
@@ -349,7 +352,10 @@ function! s:wrap(string,char,...)
endif endif
let default = "" let default = ""
if newchar ==# "T" if newchar ==# "T"
let default = matchstr(@@,'<\zs.\{-\}\ze>') if !exists("s:lastdel")
let s:lastdel = ""
endif
let default = matchstr(s:lastdel,'<\zs.\{-\}\ze>')
endif endif
let tag = input("<",default) let tag = input("<",default)
echo "<".substitute(tag,'>*$','>','') echo "<".substitute(tag,'>*$','>','')
@@ -363,6 +369,15 @@ function! s:wrap(string,char,...)
let tag = substitute(tag,'>*$','','') let tag = substitute(tag,'>*$','','')
let before = "<".tag.">" let before = "<".tag.">"
let after = "</".substitute(tag," .*",'','').">" let after = "</".substitute(tag," .*",'','').">"
if newchar == "\<C-T>" || newchar == ","
if type ==# "v" || type ==# "V"
let before = before . "\n\t"
endif
if type ==# "v"
"let keeper = initspaces.keeper
let after = "\n" . initspaces . after
endif
endif
endif endif
elseif newchar ==# 'l' || newchar == '\' elseif newchar ==# 'l' || newchar == '\'
let env = input('\begin{') let env = input('\begin{')
@@ -370,13 +385,20 @@ function! s:wrap(string,char,...)
let env = env . s:closematch(env) let env = env . s:closematch(env)
echo '\begin'.env echo '\begin'.env
if env != "" if env != ""
let before = '\begin'.env."\n\t" let before = '\begin'.env
let after = "\n".'\end'.matchstr(env,'[^}]*').'}' let after = '\end'.matchstr(env,'[^}]*').'}'
endif
if type ==# 'v' || type ==# 'V'
let before = before ."\n\t"
endif
if type ==# 'v'
let after = "\n".initspaces.after
"let keeper = initspaces.keeper
endif endif
elseif newchar ==# 'f' || newchar ==# 'F' elseif newchar ==# 'f' || newchar ==# 'F'
let func = input('function: ') let fnc = input('function: ')
if func != "" if fnc != ""
let before = substitute(func,'($','','').'(' let before = substitute(fnc,'($','','').'('
let after = ')' let after = ')'
if newchar ==# 'F' if newchar ==# 'F'
let before = before . ' ' let before = before . ' '
@@ -392,39 +414,54 @@ function! s:wrap(string,char,...)
let before = newchar let before = newchar
let after = newchar let after = newchar
endif endif
if before =~ '\n\s\+\%$' && keeper =~ '\n' if type ==# 'V'
let beforespc = substitute(matchstr(before,'\s\+\%$'),'\t',s:repeat(' ',&sw),'g') let before = initspaces.before
let keeper = s:fixindent((linemode ? beforespc : "").keeper,beforespc) let after = initspaces.after
endif let before = substitute(before,' \+$','','')
if linemode || keeper =~ '\%^\s*\n' let after = substitute(after ,'^ \+','','')
let before = substitute(before,'\s*\%$','','') if before !~ '\n\s*$'
endif
if linemode || keeper =~ '\n\s*\%$'
let after = substitute(after,'\%^\s*','','')
endif
let before = s:fixindent(before,initspaces)
let after = s:fixindent(after,initspaces)
if linemode
if before !~ '\n\s*\%$'
let before = before."\n" let before = before."\n"
endif endif
if after !~ '\%^\n' let after = initspaces.after
let after = "\n".initspaces.after "let before = substitute(before,'\n\n$','\n','')
"let after = substitute(after ,'\n\n$','\n','')
endif
if before =~ '\n\s*\%$'
if type ==# 'v'
let keeper = initspaces.keeper
endif endif
let keeper = initspaces.before.keeper.after let padding = matchstr(before,'\n\zs\s\+\%$')
let before = substitute(before,'\n\s\+\%$','\n','')
let keeper = s:fixindent(keeper,padding)
endif
"if linemode || keeper =~ '\%^\s*\n'
"let before = substitute(before,' *\%$','','')
"endif
"if linemode || keeper =~ '\n\s*\%$'
"let after = substitute(after,'\%^ *','','')
"endif
if type ==# 'V'
let keeper = before.keeper.after
elseif type =~ "^\<C-V>"
let keeper = substitute(keeper."\n",'\(.\{-\}\)\n',before.'\1'.after.'\n','g')
let g:vis = keeper
else else
" Good idea?
if keeper =~ '\n$' && after =~ '^\n' && after !~ '\n$'
let after = substitute(after,'^\n','','') . "\n"
endif
let keeper = before.extraspace.keeper.extraspace.after let keeper = before.extraspace.keeper.extraspace.after
endif endif
return keeper return keeper
endfunction " }}}1 endfunction
function! s:wrapreg(reg,char)
let orig = getreg(a:reg)
let type = getregtype(a:reg)
let new = s:wrap(orig,a:char,type)
call setreg(a:reg,new,type)
endfunction
" }}}1
function! s:insert(...) " {{{1 function! s:insert(...) " {{{1
" Optional argument causes the result to appear on 3 lines, not 1 " Optional argument causes the result to appear on 3 lines, not 1
call inputsave() "call inputsave()
let linemode = a:0 ? a:1 : 0 let linemode = a:0 ? a:1 : 0
let char = s:inputreplacement() let char = s:inputreplacement()
while char == "\<CR>" while char == "\<CR>"
@@ -432,19 +469,22 @@ function! s:insert(...) " {{{1
let linemode = linemode + 1 let linemode = linemode + 1
let char = s:inputreplacement() let char = s:inputreplacement()
endwhile endwhile
call inputrestore() "call inputrestore()
if char == "" if char == ""
return "" return ""
endif endif
" We could just use null, but nooooo, that won't work " We could just use null, but nooooo, that won't work
call inputsave() "call inputsave()
let text = s:wrap("\r",char,0) call setreg('"',"\r",'c')
call inputrestore() call s:wrapreg('"',char)
let text = @@
"let text = s:wrap("\r",char,0)
"call inputrestore()
set paste set paste
let nopaste = "\<Esc>:set nopaste\<CR>:\<BS>gi" let nopaste = "\<Esc>:set nopaste\<CR>:\<BS>gi"
if linemode if linemode
let first = matchstr(text,'.\{-\}\ze\s*\r') let first = substitute(matchstr(text,'.\{-\}\ze\s*\r'),'\n$','','')
let last = matchstr(text,'\r\s*\zs.*') let last = substitute(matchstr(text,'\r\s*\zs.*'),'^\n\s*','','')
let text = first.nopaste."\<CR>".last."\<C-O>O" let text = first.nopaste."\<CR>".last."\<C-O>O"
elseif text =~ '\r\n' elseif text =~ '\r\n'
" doesn't work with multiple newlines in second half. " doesn't work with multiple newlines in second half.
@@ -493,84 +533,75 @@ function! s:dosurround(...) " {{{1
endif endif
endif endif
let append = "" let append = ""
let original = @@ let original = getreg('"')
let @@ = "" let otype = getregtype('"')
call setreg('"',"")
exe "norm d".(scount==1 ? "": scount)."i".char exe "norm d".(scount==1 ? "": scount)."i".char
"exe "norm vi".char."d" "exe "norm vi".char."d"
let keeper = @@ let keeper = getreg('"')
let okeeper = keeper " for reindent below let okeeper = keeper " for reindent below
if @@ == "" if keeper == ""
let @@ = original call setreg('"',original,otype)
return "" return ""
endif endif
let oldline = getline('.') let oldline = getline('.')
let oldlnum = line('.') let oldlnum = line('.')
if char ==# "p" if char ==# "p"
let append = matchstr(keeper,'\n*\%$') "let append = matchstr(keeper,'\n*\%$')
let keeper = substitute(keeper,'\n*\%$','','') "let keeper = substitute(keeper,'\n*\%$','','')
let @@ = "" call setreg('"','','V')
elseif char ==# "s" || char ==# "w" || char ==# "W" elseif char ==# "s" || char ==# "w" || char ==# "W"
" Do nothing " Do nothing
let @@ = "" call setreg('"','')
elseif char =~ "[\"'`]" elseif char =~ "[\"'`]"
exe "norm! i \<Esc>d2i".char exe "norm! i \<Esc>d2i".char
let @@ = substitute(@@,' ','','') call setreg('"',substitute(getreg('"'),' ','',''))
else else
exe "norm! da".char exe "norm! da".char
endif endif
let removed = @@ 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 g:oldhead = oldhead
"let g:oldtail = oldtail
"let g:rem2 = rem2
"let g:keeper = keeper
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 oldtail ==# rem2 && 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,'\n\s*','\n','') "let keeper = substitute(keeper,oldhead.'\%$','','')
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 if oldhead == "" && a:0 < 2
let keeper = substitute(keeper,'\%^\n\(.*\)\n\%$','\1','') "let keeper = substitute(keeper,'\%^\n\(.*\)\n\%$','\1','')
endif endif
let pcmd = "P" let pcmd = "P"
endif endif
if line('.') < oldlnum && regtype ==# "V" if line('.') < oldlnum && regtype ==# "V"
let pcmd = "p" let pcmd = "p"
endif endif
if removed =~ '\n$' call setreg('"',keeper,regtype)
let keeper = keeper."\n"
let removed = substitute(removed,'\n$','','')
endif
" Originally was done twice on purpose
"if removed =~ '\n'
"let keeper = keeper . "\n"
"let removed = substitute(removed,'\n','','')
"endif
"let g:removed = removed
if newchar != "" if newchar != ""
let keeper = s:wrap(keeper,newchar,char ==# "p") . append call s:wrapreg('"',newchar)
endif endif
let @@ = substitute(keeper,'\n\s+\n','\n\n','g') silent exe "norm! ".pcmd.'`['
call setreg('"','','a'.regtype) if removed =~ '\n' || okeeper =~ '\n' || getreg('"') =~ '\n'
silent exe "norm! ".(a:0 < 2 ? "" : "").pcmd.'`['
if removed =~ '\n' || okeeper =~ '\n' || @@ =~ '\n'
call s:reindent() call s:reindent()
else else
endif endif
if getline('.') =~ '^\s\+$' && keeper =~ '^\s*\n' if getline('.') =~ '^\s\+$' && keeper =~ '^\s*\n'
silent norm! cc silent norm! cc
endif endif
let @@ = removed call setreg('"',removed,regtype)
let s:lastdel = removed
endfunction " }}}1 endfunction " }}}1
function! s:changesurround() " {{{1 function! s:changesurround() " {{{1
@@ -590,40 +621,38 @@ function! s:opfunc(type) " {{{1
if char == "" if char == ""
return s:beep() return s:beep()
endif endif
let reg = '"'
let sel_save = &selection let sel_save = &selection
let &selection = "inclusive" let &selection = "inclusive"
let reg_save = @@ let reg_save = getreg(reg)
let linemode = (a:type == "line" || a:type ==# "V") let reg_type = getregtype(reg)
let type = a:type
if a:type == "char" if a:type == "char"
silent norm! `[v`]y silent exe 'norm! `[v`]"'.reg."y"
let type = 'v'
elseif a:type == "line" elseif a:type == "line"
silent norm! '[V']y silent exe 'norm! `[V`]"'.reg."y"
elseif a:type ==# "v" || a:type ==# "V" let type = 'V'
silent norm! gvy elseif a:type ==# "v" || a:type ==# "V" || a:type ==# "\<C-V>"
silent exe 'norm! gv"'.reg."y"
elseif a:type =~ '^\d\+$' elseif a:type =~ '^\d\+$'
silent exe 'norm! ^v'.a:type.'$hy' silent exe 'norm! ^v'.a:type.'$h"'.reg.'y'
else else
let &selection = sel_save let &selection = sel_save
return s:beep() return s:beep()
endif endif
let keeper = @@ let keeper = getreg(reg)
let append = "" if type == "v"
if linemode
let append = matchstr(keeper,'\n*$')
let keeper = substitute(keeper,'\n*$','','')
else
let append = matchstr(keeper,'\s*$') let append = matchstr(keeper,'\s*$')
let keeper = substitute(keeper,'\s*$','','') let keeper = substitute(keeper,'\s*$','','')
endif endif
let @@ = reg_save " s:wrap() may peek at this call setreg(reg,keeper,type)
let keeper = s:wrap(keeper,char,linemode) . append call s:wrapreg(reg,char)
call setreg('"',keeper,linemode ? 'V' : 'v') silent exe 'norm! gv'.(reg == '"' ? '' : '"' . reg).'p`['
"let @@ = keeper if type == 'V' || getreg(reg) =~ '\n'
silent norm! gvp`[
if linemode || @@ =~ '\n'
call s:reindent() call s:reindent()
endif endif
let @@ = reg_save call setreg(reg,reg_save,reg_type)
let &selection = sel_save let &selection = sel_save
endfunction " }}}1 endfunction " }}}1