forked from VimPlug/emmet-vim
Case-insensitive type string matching
Fixing the plugin for Vim 7.4 (Travis)
This commit is contained in:
@@ -377,19 +377,20 @@ endfunction
|
|||||||
function! emmet#getFileType(...) abort
|
function! emmet#getFileType(...) abort
|
||||||
let flg = get(a:000, 0, 0)
|
let flg = get(a:000, 0, 0)
|
||||||
|
|
||||||
|
if has_key(s:emmet_settings, &filetype)
|
||||||
|
return &filetype
|
||||||
|
endif
|
||||||
|
|
||||||
let pos = emmet#util#getcurpos()
|
let pos = emmet#util#getcurpos()
|
||||||
let type = synIDattr(synID(pos[1], pos[2], 1), 'name')
|
let type = synIDattr(synID(pos[1], pos[2], 1), 'name')
|
||||||
if type =~# '^css\w'
|
if type =~? '^css\w'
|
||||||
let type = 'css'
|
let type = 'css'
|
||||||
elseif type =~# '^html\w'
|
elseif type =~? '^html\w'
|
||||||
let type = 'html'
|
let type = 'html'
|
||||||
elseif type =~# '^js\w'
|
elseif type =~? '^js\w' || '^javascript'
|
||||||
let type = 'javascript'
|
let type = 'javascript'
|
||||||
elseif type =~# '^xml'
|
elseif type =~? '^xml'
|
||||||
let type = 'xml'
|
let type = 'xml'
|
||||||
else
|
|
||||||
if has_key(s:emmet_settings, &filetype)
|
|
||||||
let type = &filetype
|
|
||||||
else
|
else
|
||||||
let types = split(&filetype, '\.')
|
let types = split(&filetype, '\.')
|
||||||
for part in types
|
for part in types
|
||||||
@@ -409,7 +410,6 @@ function! emmet#getFileType(...) abort
|
|||||||
endif
|
endif
|
||||||
endfor
|
endfor
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
|
||||||
return len(type) == 0 ? 'html' : type
|
return len(type) == 0 ? 'html' : type
|
||||||
endfunction
|
endfunction
|
||||||
|
|||||||
Reference in New Issue
Block a user