VimPlug/emmet-vim-fork
1
0
Fork 0
forked from VimPlug/emmet-vim
Code Pull Requests Activity

Add bem filter: http://docs.emmet.io/filters/bem/

Browse Source
This commit is contained in:
mattn
2013-12-06 17:06:14 +09:00
parent fee5b34b5f
commit 934feeb55f
2 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
autoload/emmet.vim
View File

@@ -1,11 +1,13 @@
"============================================================================= "=============================================================================
" emmet.vim " emmet.vim
" Author: Yasuhiro Matsumoto <mattn.jp@gmail.com> " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
" Last Change: 28-Nov-2013. " Last Change: 06-Dec-2013.
let s:save_cpo = &cpo let s:save_cpo = &cpo
set cpo&vim set cpo&vim
let s:filtermx = '|\(\%(bem\|html\|haml\|slim\|e\|c\|fc\|xsl\|t\|\/[^ ]\+\)\s*,\{0,1}\s*\)*$'
function! emmet#getExpandos(type, key) function! emmet#getExpandos(type, key)
let expandos = emmet#getResource(a:type, 'expandos', {}) let expandos = emmet#getResource(a:type, 'expandos', {})
if has_key(expandos, a:key) if has_key(expandos, a:key)
@@ -463,10 +465,9 @@ function! emmet#expandAbbr(mode, abbr) range
if len(leader) == 0 if len(leader) == 0
return '' return ''
endif endif
let mx = '|\(\%(html\|haml\|slim\|e\|c\|fc\|xsl\|t\|\/[^ ]\+\)\s*,\{0,1}\s*\)*$' if leader =~ s:filtermx
if leader =~ mx let filters = map(split(matchstr(leader, s:filtermx)[1:], '\s*[^\\]\zs,\s*'), 'substitute(v:val, "\\\\\\\\zs.\\\\ze", "&", "g")')
let filters = map(split(matchstr(leader, mx)[1:], '\s*[^\\]\zs,\s*'), 'substitute(v:val, "\\\\\\\\zs.\\\\ze", "&", "g")') let leader = substitute(leader, s:filtermx, '', '')
let leader = substitute(leader, mx, '', '')
endif endif
if leader =~ '\*' if leader =~ '\*'
let query = substitute(leader, '*', '*' . (a:lastline - a:firstline + 1), '') let query = substitute(leader, '*', '*' . (a:lastline - a:firstline + 1), '')
@@ -573,10 +574,9 @@ function! emmet#expandAbbr(mode, abbr) range
let rest = getline('.')[len(line):] let rest = getline('.')[len(line):]
endif endif
let str = part let str = part
let mx = '|\(\%(html\|haml\|slim\|e\|c\|fc\|xsl\|t\|\/[^ ]\+\)\s*,\{0,1}\s*\)*$' if str =~ s:filtermx
if str =~ mx let filters = split(matchstr(str, s:filtermx)[1:], '\s*,\s*')
let filters = split(matchstr(str, mx)[1:], '\s*,\s*') let str = substitute(str, s:filtermx, '', '')
let str = substitute(str, mx, '', '')
endif endif
let items = emmet#parseIntoTree(str, rtype).child let items = emmet#parseIntoTree(str, rtype).child
for item in items for item in items
@@ -784,15 +784,14 @@ function! emmet#codePretty() range
endfunction endfunction
function! emmet#expandWord(abbr, type, orig) function! emmet#expandWord(abbr, type, orig)
let mx = '|\(\%(html\|haml\|slim\|e\|c\|fc\|xsl\|t\|\/[^ ]\+\)\s*,\{0,1}\s*\)*$'
let str = a:abbr let str = a:abbr
let type = a:type let type = a:type
let indent = emmet#getIndentation(type) let indent = emmet#getIndentation(type)
if len(type) == 0 | let type = 'html' | endif if len(type) == 0 | let type = 'html' | endif
if str =~ mx if str =~ s:filtermx
let filters = split(matchstr(str, mx)[1:], '\s*,\s*') let filters = split(matchstr(str, s:filtermx)[1:], '\s*,\s*')
let str = substitute(str, mx, '', '') let str = substitute(str, s:filtermx, '', '')
else else
let filters = emmet#getFilters(a:type) let filters = emmet#getFilters(a:type)
if len(filters) == 0 if len(filters) == 0

26
autoload/emmet/lang/html.vim
View File

@@ -1,6 +1,6 @@
let s:mx = '\([+>]\|[<^]\+\)\{-}\s*' let s:mx = '\([+>]\|[<^]\+\)\{-}\s*'
\ .'\((*\)\{-}\s*' \ .'\((*\)\{-}\s*'
\ .'\([@#.]\{-}[a-zA-Z\!][a-zA-Z0-9:_\!\-$]*\|{\%([^$}]\+\|\$#\|\${\w\+}\|\$\+\)*}*[ \t\r\n}]*\)' \ .'\([@#.]\{-}[a-zA-Z_\!][a-zA-Z0-9:_\!\-$]*\|{\%([^$}]\+\|\$#\|\${\w\+}\|\$\+\)*}*[ \t\r\n}]*\)'
\ .'\(' \ .'\('
\ .'\%(' \ .'\%('
\ .'\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)' \ .'\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)'
@@ -386,6 +386,30 @@ function! emmet#lang#html#toString(settings, current, type, inline, filters, ite
endwhile endwhile
let attr = substitute(attr, '\$$', itemno+1, '') let attr = substitute(attr, '\$$', itemno+1, '')
endif endif
if attr == 'class' && emmet#useFilter(filters, 'bem')
let vals = split(Val, '\s\+')
let Val = ''
let lead = ''
for _val in vals
if len(Val) > 0
let Val .= ' '
endif
if _val =~ '^\a_'
let lead = _val[0]
let Val .= lead . ' ' . _val
elseif _val =~ '^_'
if len(lead) == 0
let pattr = current.parent.attr
if has_key(pattr, 'class')
let lead = pattr['class']
endif
endif
let Val .= lead . ' ' . lead . _val
else
let Val .= _val
endif
endfor
endif
let str .= ' ' . attr . '=' . q . Val . q let str .= ' ' . attr . '=' . q . Val . q
if emmet#useFilter(filters, 'c') if emmet#useFilter(filters, 'c')
if attr == 'id' | let comment .= '#' . Val | endif if attr == 'id' | let comment .= '#' . Val | endif