Merge pull request #447 from mattn/ignore-embeded

Add ignore_embeded_filetype since slim filetype is confusing to html.
This commit is contained in:
mattn
2019-01-29 01:03:24 +09:00
committed by GitHub
2 changed files with 6 additions and 0 deletions

View File

@@ -1,5 +1,6 @@
language: generic
sudo: false
dist: xenial
git:
depth: 10

View File

@@ -379,6 +379,9 @@ function! emmet#getFileType(...) abort
if has_key(s:emmet_settings, &filetype)
let type = &filetype
if emmet#getResource(type, 'ignore_embeded_filetype', 0)
return type
endif
endif
let pos = emmet#util#getcurpos()
@@ -1645,6 +1648,7 @@ let s:emmet_settings = {
\ "wfsm:n": "-webkit-font-smoothing:none;"
\ },
\ 'filters': 'fc',
\ 'ignore_embeded_filetype': 1,
\ },
\ 'sass': {
\ 'extends': 'css',
@@ -2023,6 +2027,7 @@ let s:emmet_settings = {
\ ."\tbody\n"
\ ."\t\t${child}|\n",
\ },
\ 'ignore_embeded_filetype': 1,
\ },
\ 'xhtml': {
\ 'extends': 'html'