porting-master-fixes-to-release-1.x

- Porting fixes done on 5779a87d901da3f44991feb3a6480b1156c37f3f
- Porting fixes done on c91d1bc5c15677fdb6585fc54c680809329ee88a
- Porting fixes done on c0f7d81faf849589688c4584edb9c3b8d50afb84
- Fixing linting from 1c601bcba1eed6faa15b255aeb765a12717d7de3

4 files changed, 14 insertions, 4 deletions

diff --git a/README.md b/README.md
index bcfecb2..ae7ad8e 100644
--- a/README.md
+++ b/README.md
@@ -223,8 +223,13 @@ let g:prettier#config#config_precedence = 'file-override'
 " always|never|preserve
 " default: 'preserve'
 let g:prettier#config#prose_wrap = 'preserve'
+
+" css|strict|ignore
+" default: 'css'
+let g:prettier#config#html_whitespace_sensitivity = 'css'
 ```
 
 ### REQUIREMENT(S)
 
-If prettier installation can't be found no code formatting will happen
+If the `prettier` executable can't be found by Vim, no code formatting will happen
+
diff --git a/autoload/prettier/resolver/config.vim b/autoload/prettier/resolver/config.vim
index 2db11b5..81d558d 100644
--- a/autoload/prettier/resolver/config.vim
+++ b/autoload/prettier/resolver/config.vim
@@ -25,8 +25,9 @@ function! prettier#resolver#config#resolve(config, hasSelection, start, end) abo
           \ get(a:config, 'configPrecedence', g:prettier#config#config_precedence) .
           \ ' --prose-wrap=' .
           \ get(a:config, 'proseWrap', g:prettier#config#prose_wrap) .
-          \ ' --stdin-filepath=' .
-          \ simplify(expand('%:p')) .
+          \ ' --html-whitespace-sensitivity ' .
+          \ get(a:config, 'htmlWhitespaceSensitivity', g:prettier#config#html_whitespace_sensitivity) .
+          \ ' --stdin-filepath= "'.simplify(expand('%:p')).'"' .
           \ ' --loglevel error '.
           \ ' --stdin '
   return l:cmd
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index 76ad0af..d2f059d 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,6 +1,6 @@
 " 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'
+if &filetype !~# 'markdown'
   let b:prettier_ft_default_args = {
     \ 'parser': 'html',
     \ }
diff --git a/plugin/prettier.vim b/plugin/prettier.vim
index caed7bf..19b4002 100644
--- a/plugin/prettier.vim
+++ b/plugin/prettier.vim
@@ -67,6 +67,10 @@ let g:prettier#config#config_precedence = get(g:, 'prettier#config#config_preced
 " default: 'preserve'
 let g:prettier#config#prose_wrap = get(g:, 'prettier#config#prose_wrap', 'preserve')
 
+" css|strict|ignore
+" default: 'css'
+let g:prettier#config#html_whitespace_sensitivity = get(g:, 'prettier#config#html_whitespace_sensitivity', 'css')
+
 " print semicolons
 " default: 'true'
 let g:prettier#config#semi = get(g:,'prettier#config#semi', 'true')