mirror of
https://github.com/mattn/emmet-vim.git
synced 2025-12-06 18:54:27 +08:00
Case-insensitive type string matching
Fixing the plugin for Vim 7.4 (Travis)
This commit is contained in:
@@ -377,38 +377,38 @@ 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
|
else
|
||||||
if has_key(s:emmet_settings, &filetype)
|
let types = split(&filetype, '\.')
|
||||||
let type = &filetype
|
for part in types
|
||||||
else
|
if emmet#lang#exists(part)
|
||||||
let types = split(&filetype, '\.')
|
let type = part
|
||||||
for part in types
|
break
|
||||||
if emmet#lang#exists(part)
|
endif
|
||||||
let type = part
|
let base = emmet#getBaseType(part)
|
||||||
break
|
if base !=# ''
|
||||||
|
if flg
|
||||||
|
let type = &filetype
|
||||||
|
else
|
||||||
|
let type = base
|
||||||
endif
|
endif
|
||||||
let base = emmet#getBaseType(part)
|
unlet base
|
||||||
if base !=# ''
|
break
|
||||||
if flg
|
endif
|
||||||
let type = &filetype
|
endfor
|
||||||
else
|
|
||||||
let type = base
|
|
||||||
endif
|
|
||||||
unlet base
|
|
||||||
break
|
|
||||||
endif
|
|
||||||
endfor
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
return len(type) == 0 ? 'html' : type
|
return len(type) == 0 ? 'html' : type
|
||||||
|
|||||||
Reference in New Issue
Block a user