forked from tpope/vim-commentary
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Similar to tpope#78
- Loading branch information
Showing
2 changed files
with
82 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| function! s:surroundings() abort | ||
| return split(get(b:, 'commentary_format', substitute(substitute( | ||
| \ &commentstring, '\S\zs%s',' %s','') ,'%s\ze\S', '%s ', '')), '%s', 1) | ||
| endfunction | ||
|
|
||
| function! s:strip_white_space(l,r,line) abort | ||
| let [l, r] = [a:l, a:r] | ||
| if l[-1:] == ' ' && stridx(a:line,l) == -1 && stridx(a:line,l[0:-2]) == 0 | ||
| let l = l[:-2] | ||
| endif | ||
| if r[0] == ' ' && a:line[-strlen(r):] != r && a:line[1-strlen(r):] == r[1:] | ||
| let r = r[1:] | ||
| endif | ||
| return [l, r] | ||
| endfunction | ||
|
|
||
| function! commentary#go(type,...) abort | ||
| if a:0 | ||
| let [lnum1, lnum2] = [a:type, a:1] | ||
| else | ||
| let [lnum1, lnum2] = [line("'["), line("']")] | ||
| endif | ||
|
|
||
| let [l, r] = s:surroundings() | ||
| let uncomment = 2 | ||
| for lnum in range(lnum1,lnum2) | ||
| let line = matchstr(getline(lnum),'\S.*\s\@<!') | ||
| let [l, r] = s:strip_white_space(l,r,line) | ||
| if line != '' && (stridx(line,l) || line[strlen(line)-strlen(r) : -1] != r) | ||
| let uncomment = 0 | ||
| endif | ||
| endfor | ||
|
|
||
| for lnum in range(lnum1,lnum2) | ||
| let line = getline(lnum) | ||
| if strlen(r) > 2 && l.r !~# '\\' | ||
| let line = substitute(line, | ||
| \'\M'.r[0:-2].'\zs\d\*\ze'.r[-1:-1].'\|'.l[0].'\zs\d\*\ze'.l[1:-1], | ||
| \'\=substitute(submatch(0)+1-uncomment,"^0$\\|^-\\d*$","","")','g') | ||
| endif | ||
| if uncomment | ||
| let line = substitute(line,'\S.*\s\@<!','\=submatch(0)[strlen(l):-strlen(r)-1]','') | ||
| else | ||
| let line = substitute(line,'^\%('.matchstr(getline(lnum1),'^\s*').'\|\s*\)\zs.*\S\@<=','\=l.submatch(0).r','') | ||
| endif | ||
| call setline(lnum,line) | ||
| endfor | ||
| let modelines = &modelines | ||
| try | ||
| set modelines=0 | ||
| silent doautocmd User CommentaryPost | ||
| finally | ||
| let &modelines = modelines | ||
| endtry | ||
| endfunction | ||
|
|
||
| function! commentary#textobject(inner) abort | ||
| let [l, r] = s:surroundings() | ||
| let lnums = [line('.')+1, line('.')-2] | ||
| for [index, dir, bound, line] in [[0, -1, 1, ''], [1, 1, line('$'), '']] | ||
| while lnums[index] != bound && line ==# '' || !(stridx(line,l) || line[strlen(line)-strlen(r) : -1] != r) | ||
| let lnums[index] += dir | ||
| let line = matchstr(getline(lnums[index]+dir),'\S.*\s\@<!') | ||
| let [l, r] = s:strip_white_space(l,r,line) | ||
| endwhile | ||
| endfor | ||
| while (a:inner || lnums[1] != line('$')) && empty(getline(lnums[0])) | ||
| let lnums[0] += 1 | ||
| endwhile | ||
| while a:inner && empty(getline(lnums[1])) | ||
| let lnums[1] -= 1 | ||
| endwhile | ||
| if lnums[0] <= lnums[1] | ||
| execute 'normal! 'lnums[0].'GV'.lnums[1].'G' | ||
| endif | ||
| endfunction |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters