Changeset 320 for lang/vim/surround/trunk

Timestamp:

10/01/07 04:55:35 (16 months ago)

Author:

kana

Message:

lang/vim/surround:
* Support user-defined objects as a surrounding target.

Location:

lang/vim/surround/trunk

Files:

• doc/surround.txt (modified) (2 diffs, 1 prop)
• plugin/surround.vim (modified) (9 diffs, 1 prop)

lang/vim/surround/trunk/doc/surround.txt

@@ -3 +3 @@
 Author:  Tim Pope <vimNOSPAM@tpope.info>        *surround-author*
 License: Same terms as Vim itself (see |license|)
+
+NOTE: This is a modified version of surround.vim.  See |surround-changelog|
+for the detail of the difference from the original version.
 
 This plugin is only available if 'compatible' is not set.
@@ -222 +225 @@
 It would be nice if |.| would work to repeat an operation.
 
+
+
+
+CHANGELOG                                       *surround-changelog*
+
+2007-10-01T00:25:20+09:00       kana    <http://nicht.s8.xrea.com/>
+
+        - Support user-defined surrounding objects (|surround-customizing|) as
+          |surround-targets|.  The original version (1.26) does not support
+          this feature.
+
+          BUGS: [count] is not supported yet.
+
+
+
+
  vim:tw=78:ts=8:ft=help:norl:

lang/vim/surround/trunk/plugin/surround.vim

@@ -2 +2 @@
 " Author:       Tim Pope <vimNOSPAM@tpope.info>
 " GetLatestVimScripts: 1697 1 :AutoInstall: surround.vim
-" $Id: surround.vim,v 1.26 2007-07-31 14:20:47 tpope Exp $
+" $Id$
 "
 " See surround.txt for help.  This can be accessed by doing
@@ -173 +173 @@
     endif
     let idx = stridx(pairs,newchar)
+    let user_defined_object = s:get_user_defined_object(newchar)
     if newchar == ' '
         let before = ''
         let after  = ''
-    elseif exists("b:surround_".char2nr(newchar))
-        let all    = s:process(b:surround_{char2nr(newchar)})
-        let before = s:extractbefore(all)
-        let after  =  s:extractafter(all)
-    elseif exists("g:surround_".char2nr(newchar))
-        let all    = s:process(g:surround_{char2nr(newchar)})
+    elseif len(user_defined_object)
+        let all    = s:process(user_defined_object)
         let before = s:extractbefore(all)
         let after  =  s:extractafter(all)
@@ -389 +386 @@
 endfunction " }}}1
 
-function! s:dosurround(...) " {{{1
+function! s:dosurround(...) "{{{1
+    " ([target-surrounding-object-char, [new-surrounding-object-char]])
+    " adjust arguments  "{{{2
     let scount = v:count1
     let char = (a:0 ? a:1 : s:inputtarget())
@@ -414 +413 @@
         endif
     endif
+
+    " save and initialize some values  "{{{2
     let cb_save = &clipboard
     set clipboard-=unnamed
@@ -420 +421 @@
     let otype = getregtype('"')
     call setreg('"',"")
+
+    " move the target text range into @@, then delete surroudings  "{{{2
     let strcount = (scount == 1 ? "" : scount)
-    if char == '/'
+    let user_defined_object = s:get_user_defined_object(char)
+    if len(user_defined_object)  " FIXME: [count] is not supported yet
+        let all = s:process(user_defined_object)
+        let before = s:extractbefore(all)
+        let after = s:extractafter(all)
+        call s:search_literally(before, 'bcW')
+        normal! v
+        call s:search_literally(after, 'ceW')
+        normal! d
+    elseif char == '/'
         exe 'norm '.strcount.'[/d'.strcount.']/'
     else
@@ -436 +448 @@
     let oldline = getline('.')
     let oldlnum = line('.')
-    if char ==# "p"
+    if len(user_defined_object)
+        call setreg('"', before.after, '')
+        let keeper = keeper[len(before):]
+        let keeper = keeper[:-(len(after)+1)]
+    elseif char ==# "p"
         "let append = matchstr(keeper,'\n*\%$')
         "let keeper = substitute(keeper,'\n*\%$','','')
@@ -482 +498 @@
         let pcmd = "p"
     endif
+
+    " surround @@ new objects  "{{{2
     call setreg('"',keeper,regtype)
     if newchar != ""
         call s:wrapreg('"',newchar)
     endif
+
+    " put the result into the original position, then reindent  "{{{2
     silent exe 'norm! ""'.pcmd.'`['
     if removed =~ '\n' || okeeper =~ '\n' || getreg('"') =~ '\n'
@@ -494 +514 @@
         silent norm! cc
     endif
+
+    " restore the original value, set some values for later use  "{{{2
     call setreg('"',removed,regtype)
     let s:lastdel = removed
@@ -583 +605 @@
     endif
 endfunction " }}}1
+ 
+" Misc. functions  "{{{1
+function! s:search_literally(pattern, flags)
+    return search(s:literalize_pattern(a:pattern), a:flags)
+endfunction
+
+function! s:literalize_pattern(pattern)
+    return '\V'.substitute(a:pattern, '\', '\\', 'g')
+endfunction
+
+function! s:get_user_defined_object(char)
+    if exists("b:surround_".char2nr(a:char))
+        return b:surround_{char2nr(a:char)}
+    elseif exists("g:surround_".char2nr(a:char))
+        return g:surround_{char2nr(a:char)}
+    else
+        return ''
+    endif
+endfunction
+"}}}1
 
 nnoremap <silent> <Plug>Dsurround  :<C-U>call <SID>dosurround(<SID>inputtarget())<CR>