VimPlug/emmet-vim
1
0
Fork 1
mirror of https://github.com/mattn/emmet-vim.git synced 2025-12-07 11:14:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed indent.

Browse Source
This commit is contained in:
mattn
2010-02-19 21:50:18 +09:00
parent 2f44ab7c9c
commit f79e0bfcd7
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
zencoding.vim
View File

@@ -965,9 +965,9 @@ function! s:zen_toString(...)
return str return str
endfunction endfunction
function! s:zen_expand() function! s:zen_expand(word)
let line = getline('.')[:col('.')-1] let line = getline('.')[:col('.')-2]
let part = matchstr(line, '\(\S*\)\s\{-}$') let part = matchstr(line, a:word ? '\(\w\+\)$' : '\(\S*\)$')
let rest = getline('.')[col('.')-1:] let rest = getline('.')[col('.')-1:]
let type = &ft let type = &ft
let items = s:zen_parseIntoTree(part, type)['child'] let items = s:zen_parseIntoTree(part, type)['child']
@@ -983,11 +983,13 @@ function! s:zen_expand()
let expand .= '|' let expand .= '|'
endif endif
let expand = substitute(expand, '${lang}', s:zen_settings['lang'], 'g') let expand = substitute(expand, '${lang}', s:zen_settings['lang'], 'g')
silent! exec "normal! ".repeat("x", len(part)) if line[:-len(part)-1] =~ '^\s*$'
let size = len(line) - len(part) let size = len(line) - len(part)
let indent = repeat(s:zen_settings['indentation'], size) let indent = repeat(s:zen_settings['indentation'], size)
let expand = indent . substitute(expand, "\n", "\n" . indent, 'g') . rest else
let oldautoindent = &autoindent let indent = ''
endif
let expand = line[:-len(part)-1] . substitute(expand, "\n", "\n" . indent, 'g') . rest
let lines = split(expand, '\n') let lines = split(expand, '\n')
call setline(line('.'), lines[0]) call setline(line('.'), lines[0])
if len(lines) > 1 if len(lines) > 1
@@ -1007,8 +1009,10 @@ function! ZenExpand(abbr, type)
return expand return expand
endfunction endfunction
inoremap <plug>ZenCodingExpand <c-r>=<sid>zen_expand()<cr><esc>/\|<cr>a<bs> inoremap <plug>ZenCodingExpandWord <c-r>=<sid>zen_expand(1)<cr><esc>/\|<cr>a<bs>
imap <c-z>, <plug>ZenCodingExpand inoremap <plug>ZenCodingExpandAbbr <c-g>u<c-r>=<sid>zen_expand(0)<cr><esc>/\|<cr>a<bs>
imap <c-z>. <plug>ZenCodingExpandWord
imap <c-z>, <plug>ZenCodingExpandAbbr
function! s:zen_mergeConfig(lhs, rhs) function! s:zen_mergeConfig(lhs, rhs)
if type(a:lhs) == 3 && type(a:rhs) == 3 if type(a:lhs) == 3 && type(a:rhs) == 3