From 8f088c9f73af663731df4eed22875989dcaf43dd Mon Sep 17 00:00:00 2001 From: mattn Date: Tue, 13 Aug 2013 18:59:13 +0900 Subject: [PATCH] Add emmet#getFilter() --- autoload/emmet.vim | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/autoload/emmet.vim b/autoload/emmet.vim index 76ea426..833277d 100644 --- a/autoload/emmet.vim +++ b/autoload/emmet.vim @@ -230,6 +230,11 @@ function! emmet#getSettings() return s:emmet_settings endfunction +function! emmet#getFilters(type) + let filterstr = emmet#getResource(a:type, 'filters', '') + return split(filterstr, '\s*,\s*') +endfunction + function! emmet#getResource(type, name, default) if !has_key(s:emmet_settings, a:type) return a:default @@ -399,14 +404,13 @@ function! emmet#expandAbbr(mode, abbr) range let rtype = emmet#getFileType(1) let indent = emmet#getIndentation(type) let expand = '' - let filters = ['html'] let line = '' let part = '' let rest = '' - let filterstr = emmet#getResource(type, 'filters', '') - if len(filterstr) > 0 - let filters = split(filterstr, '\s*,\s*') + let filters = emmet#getFilters(type) + if len(filters) == 0 + let filters = ['html'] endif if a:mode == 2 @@ -721,10 +725,11 @@ function! emmet#ExpandWord(abbr, type, orig) if str =~ mx let filters = split(matchstr(str, mx)[1:], '\s*,\s*') let str = substitute(str, mx, '', '') - elseif has_key(s:emmet_settings[a:type], 'filters') - let filters = split(s:emmet_settings[a:type].filters, '\s*,\s*') else - let filters = ['html'] + let filters = emmet#getFilters(a:type) + if len(filters) == 0 + let filters = ['html'] + endif endif let items = emmet#parseIntoTree(str, a:type).child let expand = ''