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

support: Upgraded "Wrap With Abbreviation" action

Browse Source
This commit is contained in:
mattn
2011-10-14 21:35:38 +09:00
parent f8f9dcd72e
commit eaa447fb40
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
autoload/zencoding.vim
View File

@@ -379,9 +379,6 @@ function! s:zen_toString_haml(settings, current, type, inline, filters, itemno,
endif endif
endif endif
let str .= "\n" let str .= "\n"
if !empty(current.parent) && empty(current.parent.parent)
let str = substitute(str, '\$#', '$line'.(itemno+1).'$', 'g')
endif
return str return str
endfunction endfunction
@@ -478,9 +475,6 @@ function! s:zen_toString_html(settings, current, type, inline, filters, itemno,
if len(comment) > 0 if len(comment) > 0
let str .= "<!-- /" . comment . " -->" . (inline ? "" : "\n") . comment_indent let str .= "<!-- /" . comment . " -->" . (inline ? "" : "\n") . comment_indent
endif endif
if !empty(current.parent) && empty(current.parent.parent)
let str = substitute(str, '\$#', '$line'.(itemno+1).'$', 'g')
endif
return str return str
endfunction endfunction
@@ -519,13 +513,18 @@ function! s:zen_toString(...)
let str = '' let str = ''
while itemno < current.multiplier while itemno < current.multiplier
if len(current.name) if len(current.name)
let inner = ''
if exists('*g:zen_toString_'.type) if exists('*g:zen_toString_'.type)
let str .= function('g:zen_toString_'.type)(s:zen_settings, current, type, inline, filters, itemno, indent) let inner = function('g:zen_toString_'.type)(s:zen_settings, current, type, inline, filters, itemno, indent)
elseif s:zen_useFilter(filters, 'haml') elseif s:zen_useFilter(filters, 'haml')
let str .= s:zen_toString_haml(s:zen_settings, current, type, inline, filters, itemno, indent) let inner = s:zen_toString_haml(s:zen_settings, current, type, inline, filters, itemno, indent)
else else
let str .= s:zen_toString_html(s:zen_settings, current, type, inline, filters, itemno, indent) let inner = s:zen_toString_html(s:zen_settings, current, type, inline, filters, itemno, indent)
endif endif
if current.multiplier > 1
let inner = substitute(inner, '\$#', '$line'.(itemno+1).'$', 'g')
endif
let str .= inner
else else
let snippet = current.snippet let snippet = current.snippet
if len(current.snippet) == 0 if len(current.snippet) == 0
@@ -645,7 +644,7 @@ function! zencoding#expandAbbr(mode) range
if leader =~ '\*' if leader =~ '\*'
let query = substitute(leader, '*', '*' . (a:lastline - a:firstline + 1), '') let query = substitute(leader, '*', '*' . (a:lastline - a:firstline + 1), '')
if query !~ '}\s*$' if query !~ '}\s*$'
let query .= '>{$line$}' let query .= '>{$#}'
endif endif
let items = s:zen_parseIntoTree(query, type).child let items = s:zen_parseIntoTree(query, type).child
for item in items for item in items