find resource for each of filetype which is separated with dot. fix #265

This commit is contained in:
mattn
2015-07-26 21:35:21 +09:00
parent e2c2f48716
commit 5dda53c1ec

View File

@@ -290,13 +290,15 @@ function! emmet#getResource(type, name, default) abort
if exists('b:emmet_' . a:name) if exists('b:emmet_' . a:name)
return get(b:, 'emmet_' . a:name) return get(b:, 'emmet_' . a:name)
endif endif
if !has_key(s:emmet_settings, a:type)
return a:default for type in split(a:type, '\.')
if !has_key(s:emmet_settings, type)
continue
endif endif
let ret = a:default let ret = a:default
if has_key(s:emmet_settings[a:type], 'extends') if has_key(s:emmet_settings[type], 'extends')
let extends = s:emmet_settings[a:type].extends let extends = s:emmet_settings[type].extends
if type(extends) ==# 1 if type(extends) ==# 1
let tmp = split(extends, '\s*,\s*') let tmp = split(extends, '\s*,\s*')
unlet! extends unlet! extends
@@ -313,15 +315,19 @@ function! emmet#getResource(type, name, default) abort
endfor endfor
endif endif
if has_key(s:emmet_settings[a:type], a:name) if has_key(s:emmet_settings[type], a:name)
if type(ret) ==# 3 || type(ret) ==# 4 if type(ret) ==# 3 || type(ret) ==# 4
call emmet#mergeConfig(ret, s:emmet_settings[a:type][a:name]) call emmet#mergeConfig(ret, s:emmet_settings[type][a:name])
else else
let ret = s:emmet_settings[a:type][a:name] let ret = s:emmet_settings[type][a:name]
endif endif
endif endif
if !empty(ret)
return ret return ret
endif
endfor
return a:default
endfunction endfunction
function! emmet#getFileType(...) abort function! emmet#getFileType(...) abort