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,38 +290,44 @@ 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
endif
let ret = a:default
if has_key(s:emmet_settings[a:type], 'extends') for type in split(a:type, '\.')
let extends = s:emmet_settings[a:type].extends if !has_key(s:emmet_settings, type)
if type(extends) ==# 1 continue
let tmp = split(extends, '\s*,\s*')
unlet! extends
let extends = tmp
endif endif
for ext in extends let ret = a:default
if has_key(s:emmet_settings, ext) && has_key(s:emmet_settings[ext], a:name)
if type(ret) ==# 3 || type(ret) ==# 4 if has_key(s:emmet_settings[type], 'extends')
call emmet#mergeConfig(ret, s:emmet_settings[ext][a:name]) let extends = s:emmet_settings[type].extends
else if type(extends) ==# 1
let ret = s:emmet_settings[ext][a:name] let tmp = split(extends, '\s*,\s*')
endif unlet! extends
let extends = tmp
endif endif
endfor for ext in extends
endif if has_key(s:emmet_settings, ext) && has_key(s:emmet_settings[ext], a:name)
if type(ret) ==# 3 || type(ret) ==# 4
if has_key(s:emmet_settings[a:type], a:name) call emmet#mergeConfig(ret, s:emmet_settings[ext][a:name])
if type(ret) ==# 3 || type(ret) ==# 4 else
call emmet#mergeConfig(ret, s:emmet_settings[a:type][a:name]) let ret = s:emmet_settings[ext][a:name]
else endif
let ret = s:emmet_settings[a:type][a:name] endif
endfor
endif endif
endif
return ret if has_key(s:emmet_settings[type], a:name)
if type(ret) ==# 3 || type(ret) ==# 4
call emmet#mergeConfig(ret, s:emmet_settings[type][a:name])
else
let ret = s:emmet_settings[type][a:name]
endif
endif
if !empty(ret)
return ret
endif
endfor
return a:default
endfunction endfunction
function! emmet#getFileType(...) abort function! emmet#getFileType(...) abort