Merge pull request #196 from prettier/shore/master-rebasing

Shore/master rebasing
prettier · Aug 26, 2019 · e5d7587 · e5d7587
2 parents 8601e00 + 394f422
commit e5d7587
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 TODO
+doc/tags
 node_modules
 .yarn_lock
 yarn.lock
diff --git a/doc/prettier.txt b/doc/prettier.txt
@@ -182,6 +182,9 @@ However they can be configured by:
   " always|never|preserve
   " default: '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/ftdetect/javascript.vim b/ftdetect/javascript.vim
@@ -1,3 +1,3 @@
 augroup PrettierFileDetect
-  autocmd BufNewFile,BufReadPost *.js setfiletype javascript
+  autocmd BufNewFile,BufReadPost *.js,*jsx setfiletype javascript
 augroup end
diff --git a/ftdetect/typescript.vim b/ftdetect/typescript.vim
@@ -1,3 +1,3 @@
 augroup PrettierFileDetect
-  autocmd BufNewFile,BufReadPost *.ts setfiletype typescript
+  autocmd BufNewFile,BufReadPost *.ts,*.tsx setfiletype typescript
 augroup end
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
@@ -0,0 +1,14 @@
+" 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!
+  if g:prettier#autoformat
+    autocmd BufWritePre *.html call prettier#Autoformat()
+  endif
+augroup end