VimPlug/emmet-vim-fork
1
0
Fork 0
forked from VimPlug/emmet-vim
Code Pull Requests Activity

Merge pull request #447 from mattn/ignore-embeded

Browse Source 
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
parent 3720be60fb 922784dad6
commit 19f2821b7b
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

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

5
autoload/emmet.vim
View File

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