Merge branch 'master' into handle-path-whitespace

5 files changed, 18 insertions, 3 deletions

diff --git a/README.md b/README.md
index b8e2ae2..c62bac0 100644
--- a/README.md
+++ b/README.md
@@ -219,6 +219,9 @@ let g:prettier#config#config_precedence = 'prefer-file'
 
 " always|never|preserve
 let g:prettier#config#prose_wrap = 'preserve'
+
+" css|strict|ignore
+let g:prettier#config#html_whitespace_sensitivity = 'css'
 ```
 
 ### REQUIREMENT(S)
diff --git a/autoload/prettier.vim b/autoload/prettier.vim
index a957e60..52e9ea8 100644
--- a/autoload/prettier.vim
+++ b/autoload/prettier.vim
@@ -324,6 +324,8 @@ function! s:Get_Prettier_Exec_Args(config) abort
           \ get(a:config, 'configPrecedence', g:prettier#config#config_precedence) .
           \ ' --prose-wrap ' .
           \ get(a:config, 'proseWrap', g:prettier#config#prose_wrap) .
+          \ ' --html-whitespace-sensitivity ' .
+          \ get(a:config, 'htmlWhitespaceSensitivity', g:prettier#config#html_whitespace_sensitivity) .
           \ ' --stdin-filepath "' .
           \ simplify(expand('%:p')) . '"' .
           \ ' --loglevel error '.
diff --git a/doc/prettier.txt b/doc/prettier.txt
index 7e9e863..67ba8d0 100644
--- a/doc/prettier.txt
+++ b/doc/prettier.txt
@@ -174,6 +174,9 @@ However they can be configured by:
 
   " always|never|preserve
   let g:prettier#config#prose_wrap = 'preserve'
+
+  " css|strict|ignore
+  let g:prettier#config#html_whitespace_sensitivity = 'css'
 <
 ==============================================================================
 REQUIREMENT(S)                                      *vim-prettier-requirements*
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index e34931a..39a608f 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,6 +1,10 @@
-let b:prettier_ft_default_args = {
-  \ 'parser': 'html',
-  \ }
+" markdown files run this as well
+" https://stackoverflow.com/questions/22839269/why-does-vim-default-markdown-ftplugin-source-html-ftplugins-is-there-any-ways
+if &ft !=# 'markdown'
+  let b:prettier_ft_default_args = {
+    \ 'parser': 'html',
+    \ }
+endif
 
 augroup Prettier
   autocmd!
diff --git a/plugin/prettier.vim b/plugin/prettier.vim
index b7f2855..84b2485 100644
--- a/plugin/prettier.vim
+++ b/plugin/prettier.vim
@@ -69,6 +69,9 @@ let g:prettier#config#config_precedence = get(g:, 'prettier#config#config_preced
 " always|never|preserve
 let g:prettier#config#prose_wrap = get(g:, 'prettier#config#prose_wrap', 'preserve')
 
+" css|strict|ignore
+let g:prettier#config#html_whitespace_sensitivity = get(g:, 'prettier#config#html_whitespace_sensitivity', 'css')
+
 " Don't leave the quicklist focused on error.
 let g:prettier#quickfix_auto_focus = get(g:, 'prettier#quickfix_auto_focus', 1)