From d99b422a39302130068cf1e4ce7ca62207b2682d Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Mon, 28 Jan 2019 23:59:03 +0900 Subject: [PATCH 1/6] Add ignore_embeded_filetype since slim filetype is confusing to html. --- autoload/emmet.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/autoload/emmet.vim b/autoload/emmet.vim index 37f3f97..52b23d8 100644 --- a/autoload/emmet.vim +++ b/autoload/emmet.vim @@ -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() @@ -2023,6 +2026,7 @@ let s:emmet_settings = { \ ."\tbody\n" \ ."\t\t${child}|\n", \ }, +\ 'ignore_embeded_filetype': 1, \ }, \ 'xhtml': { \ 'extends': 'html' From 5fc2cc0fae7f544a370eda9178b2bb8567eff96a Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 29 Jan 2019 00:09:20 +0900 Subject: [PATCH 2/6] xenial --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3af6810..9bec461 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: generic sudo: false +dist: xenial git: depth: 10 From 5d6870c0af190a9d9d27d2dff96e1b86f71fb015 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 29 Jan 2019 00:15:23 +0900 Subject: [PATCH 3/6] Add ignore_embeded_filetype --- autoload/emmet.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/autoload/emmet.vim b/autoload/emmet.vim index 52b23d8..0a65873 100644 --- a/autoload/emmet.vim +++ b/autoload/emmet.vim @@ -1669,6 +1669,7 @@ let s:emmet_settings = { \ }, \ 'css.drupal': { \ 'extends': 'css', +\ 'ignore_embeded_filetype': 1, \ }, \ 'html': { \ 'snippets': { From b79f9128d3d7f309ef6baf14819893be9e17ec68 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 29 Jan 2019 00:41:06 +0900 Subject: [PATCH 4/6] Fix test --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6bd2af1..004bd95 100644 --- a/Makefile +++ b/Makefile @@ -12,4 +12,4 @@ release: emmet-vim.zip test: @-rm -f test.log 2> /dev/null - @vim -N -c "let &rtp .= ',' . getcwd()" -c "so unittest.vim" -c EmmetUnitTest! || cat test.log || exit 1 + @vim -N -c "let &rtp .= getcwd()" -c "so unittest.vim" -c EmmetUnitTest! || cat test.log || exit 1 From eb8a4782ba073db772adc7f9d8e44b7842ff0762 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 29 Jan 2019 00:54:17 +0900 Subject: [PATCH 5/6] Fix css --- autoload/emmet.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/emmet.vim b/autoload/emmet.vim index 0a65873..63cac5b 100644 --- a/autoload/emmet.vim +++ b/autoload/emmet.vim @@ -1648,6 +1648,7 @@ let s:emmet_settings = { \ "wfsm:n": "-webkit-font-smoothing:none;" \ }, \ 'filters': 'fc', +\ 'ignore_embeded_filetype': 1, \ }, \ 'sass': { \ 'extends': 'css', @@ -1669,7 +1670,6 @@ let s:emmet_settings = { \ }, \ 'css.drupal': { \ 'extends': 'css', -\ 'ignore_embeded_filetype': 1, \ }, \ 'html': { \ 'snippets': { From 922784dad67c3960c8f0a3c1d114a9c7b7be41bc Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 29 Jan 2019 00:57:37 +0900 Subject: [PATCH 6/6] Fix Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 004bd95..6bd2af1 100644 --- a/Makefile +++ b/Makefile @@ -12,4 +12,4 @@ release: emmet-vim.zip test: @-rm -f test.log 2> /dev/null - @vim -N -c "let &rtp .= getcwd()" -c "so unittest.vim" -c EmmetUnitTest! || cat test.log || exit 1 + @vim -N -c "let &rtp .= ',' . getcwd()" -c "so unittest.vim" -c EmmetUnitTest! || cat test.log || exit 1