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

Fixes extends of filter. sass filter doesn't extend css's one

Browse Source
This commit is contained in:
mattn
2013-08-13 18:43:19 +09:00
parent f18cb41f93
commit c257e09d69
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
autoload/emmet.vim
View File

@@ -1,7 +1,7 @@
"============================================================================= "=============================================================================
" emmet.vim " emmet.vim
" Author: Yasuhiro Matsumoto <mattn.jp@gmail.com> " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
" Last Change: 09-Aug-2013. " Last Change: 13-Aug-2013.
let s:save_cpo = &cpo let s:save_cpo = &cpo
set cpo&vim set cpo&vim
@@ -245,7 +245,12 @@ function! emmet#getResource(type, name, default)
endif endif
for ext in extends for ext in extends
if has_key(s:emmet_settings, ext) && has_key(s:emmet_settings[ext], a:name) if has_key(s:emmet_settings, ext) && has_key(s:emmet_settings[ext], a:name)
let V = s:emmet_settings[ext][a:name]
if type(ret) == 3 || type(ret) == 4
call emmet#mergeConfig(ret, s:emmet_settings[ext][a:name]) call emmet#mergeConfig(ret, s:emmet_settings[ext][a:name])
else
let ret = s:emmet_settings[ext][a:name]
endif
endif endif
endfor endfor
endif endif
@@ -399,8 +404,9 @@ function! emmet#expandAbbr(mode, abbr) range
let part = '' let part = ''
let rest = '' let rest = ''
if has_key(s:emmet_settings, type) && has_key(s:emmet_settings[type], 'filters') let filterstr = emmet#getResource(type, 'filters', '')
let filters = split(s:emmet_settings[type].filters, '\s*,\s*') if len(filterstr) > 0
let filters = split(filterstr, '\s*,\s*')
endif endif
if a:mode == 2 if a:mode == 2