From 9cce773acbb02fc5c122803bcaf05d81fb67d961 Mon Sep 17 00:00:00 2001 From: jpsouzasilva Date: Tue, 28 Aug 2018 23:46:27 -0300 Subject: [PATCH] Case-insensitive type string matching Fixing the plugin for Vim 7.4 (Travis) --- autoload/emmet.vim | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/autoload/emmet.vim b/autoload/emmet.vim index d5fcc18..eba988e 100644 --- a/autoload/emmet.vim +++ b/autoload/emmet.vim @@ -377,38 +377,38 @@ endfunction function! emmet#getFileType(...) abort let flg = get(a:000, 0, 0) + if has_key(s:emmet_settings, &filetype) + return &filetype + endif + let pos = emmet#util#getcurpos() let type = synIDattr(synID(pos[1], pos[2], 1), 'name') - if type =~# '^css\w' + if type =~? '^css\w' let type = 'css' - elseif type =~# '^html\w' + elseif type =~? '^html\w' let type = 'html' - elseif type =~# '^js\w' + elseif type =~? '^js\w' || '^javascript' let type = 'javascript' - elseif type =~# '^xml' + elseif type =~? '^xml' let type = 'xml' else - if has_key(s:emmet_settings, &filetype) - let type = &filetype - else - let types = split(&filetype, '\.') - for part in types - if emmet#lang#exists(part) - let type = part - break + let types = split(&filetype, '\.') + for part in types + if emmet#lang#exists(part) + let type = part + break + endif + let base = emmet#getBaseType(part) + if base !=# '' + if flg + let type = &filetype + else + let type = base endif - let base = emmet#getBaseType(part) - if base !=# '' - if flg - let type = &filetype - else - let type = base - endif - unlet base - break - endif - endfor - endif + unlet base + break + endif + endfor endif return len(type) == 0 ? 'html' : type