hasufell/neosnippet.vim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #314 from grafi-tt/issue305-indent-selected-target-lines

Browse Source 
Detect and correctly shift indent level of selected target lines.
This commit is contained in:
Shougo 2015-12-29 21:23:20 +09:00
commit 0b3b441bef
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
autoload/neosnippet/view.vim
View File

@ -429,7 +429,9 @@ function! s:expand_target_placeholder(line, col) "{{{
let target_lines = split(neosnippet.target, '\n', 1) let target_lines = split(neosnippet.target, '\n', 1)
let cur_text = getline(a:line)[: a:col-2] let cur_text = getline(a:line)[: a:col-2]
let target_lines[0] = cur_text . target_lines[0] if match(cur_text, '^\s\+$') < 0
let target_lines[0] = cur_text . target_lines[0]
endif
let target_lines[-1] = target_lines[-1] . next_line let target_lines[-1] = target_lines[-1] . next_line
let begin_line = a:line let begin_line = a:line
@ -438,10 +440,27 @@ function! s:expand_target_placeholder(line, col) "{{{
let col = col('.') let col = col('.')
try try
let base_indent = matchstr(cur_text, '^\s\+') let base_indent = matchstr(cur_text, '^\s\+')
let target_base_indent = -1
for target_line in target_lines
if match(target_line, '^\s\+$') < 0
let target_current_indent = max([matchend(target_line, '^ *'), matchend(target_line, '^\t*') * &tabstop])
if target_base_indent < 0 || target_current_indent < target_base_indent
let target_base_indent = target_current_indent
endif
endif
endfor
if target_base_indent < 0
let target_base_indent = 0
end
let target_strip_indent_regex = '^\s\+$\|^' .
\ repeat(' ', target_base_indent) . '\|^' .
\ repeat('\t', target_base_indent / &tabstop)
call map(target_lines, 'substitute(v:val, target_strip_indent_regex, "", "")')
call map(target_lines, 'v:val == "" ? "" : base_indent . v:val')
call setline(a:line, target_lines[0]) call setline(a:line, target_lines[0])
if len(target_lines) > 1 if len(target_lines) > 1
call append(a:line, map(target_lines[1:], call append(a:line, target_lines[1:])
\ 'base_indent . v:val'))
endif endif
call cursor(end_line, 0) call cursor(end_line, 0)
@ -459,7 +478,6 @@ function! s:expand_target_placeholder(line, col) "{{{
endif endif
endtry endtry
call s:indent_snippet(begin_line, end_line)
let neosnippet.target = '' let neosnippet.target = ''
call neosnippet#view#_jump('', col) call neosnippet#view#_jump('', col)