mirror of
https://github.com/mattn/emmet-vim.git
synced 2025-12-09 03:54:47 +08:00
Fixes extends of filter. sass filter doesn't extend css's one
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user