Merge branch 'master' into release/1.x

14 files changed, 51 insertions, 19 deletions

diff --git a/.travis.yml b/.travis.yml
index 957cc9c..a709b20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 ---
 language: python
-dist: precise
+python:
+  - "3.6"
 install: 
-  - pip install vim-vint
+  - pip install enum34 pathlib typing vim-vint
 script: 
   - vint .
diff --git a/README.md b/README.md
index 7c3c775..fc1eacf 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ yarn|npm installed globally.
 " post install (yarn install | npm install) then load plugin only for editing supported files
 Plug 'prettier/vim-prettier', {
   \ 'do': 'yarn install',
-  \ 'for': ['javascript', 'typescript', 'css', 'less', 'scss', 'json', 'graphql', 'markdown', 'vue'] }
+  \ 'for': ['javascript', 'typescript', 'css', 'less', 'scss', 'json', 'graphql', 'markdown', 'vue', 'yaml'] }
 ```
 
 or simply enable for all formats by:
@@ -171,14 +171,14 @@ Running before saving sync:
 
 ```vim
 let g:prettier#autoformat = 0
-autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue Prettier
+autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml Prettier
 ```
 
 Running before saving async (vim 8+):
 
 ```vim
 let g:prettier#autoformat = 0
-autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue PrettierAsync
+autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml PrettierAsync
 ```
 
 Running before saving, changing text or leaving insert mode:
@@ -188,7 +188,7 @@ Running before saving, changing text or leaving insert mode:
 let g:prettier#quickfix_enabled = 0
 
 let g:prettier#autoformat = 0
-autocmd BufWritePre,TextChanged,InsertLeave *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue PrettierAsync
+autocmd BufWritePre,TextChanged,InsertLeave *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml PrettierAsync
 ```
 
 ### Overwrite default prettier configuration
diff --git a/doc/prettier.txt b/doc/prettier.txt
index 3760ca7..5b6c1a4 100644
--- a/doc/prettier.txt
+++ b/doc/prettier.txt
@@ -47,7 +47,7 @@ node and yarn|npm installed globally.
   Plug 'prettier/vim-prettier', {
 	\ 'do': 'yarn install',
 	\ 'for': ['javascript', 'typescript', 'css',
-	\         'less', 'scss', 'json', 'graphql', 'markdown', 'vue'] }
+	\         'less', 'scss', 'json', 'graphql', 'markdown', 'vue', 'yaml'] }
 <
 or simply enable for all formats by:
 >
@@ -136,19 +136,19 @@ First disable the default autoformat, then update to your own custom behaviour
 Running before saving sync:
 >
   let g:prettier#autoformat = 0
-  autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue Prettier
+  autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml Prettier
 <
 Running before saving async (vim 8+):
 >
   let g:prettier#autoformat = 0
-  autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue PrettierAsync
+  autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml PrettierAsync
 <
 Running before saving, changing text or leaving insert mode: 
 >
   " when running at every change you may want to disable quickfix
   let g:prettier#quickfix_enabled = 0
   let g:prettier#autoformat = 0
-  autocmd BufWritePre,TextChanged,InsertLeave *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue PrettierAsync
+  autocmd BufWritePre,TextChanged,InsertLeave *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml PrettierAsync
 <
 Overwrite default prettier configuration
 
diff --git a/ftdetect/css.vim b/ftdetect/css.vim
index bb7ccff..4718045 100644
--- a/ftdetect/css.vim
+++ b/ftdetect/css.vim
@@ -1 +1,3 @@
-autocmd BufNewFile,BufReadPost *.css setfiletype css
+augroup PrettierFileDetect
+  autocmd BufNewFile,BufReadPost *.css setfiletype css
+augroup end
diff --git a/ftdetect/graphql.vim b/ftdetect/graphql.vim
index 5d4c31e..031b545 100644
--- a/ftdetect/graphql.vim
+++ b/ftdetect/graphql.vim
@@ -1 +1,3 @@
-autocmd BufNewFile,BufReadPost *.graphql,*.gql setfiletype graphql
+augroup PrettierFileDetect
+  autocmd BufNewFile,BufReadPost *.graphql,*.gql setfiletype graphql
+augroup end
diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
index 51ef507..fc6b326 100644
--- a/ftdetect/javascript.vim
+++ b/ftdetect/javascript.vim
@@ -1 +1,3 @@
-autocmd BufNewFile,BufReadPost *.js setfiletype javascript
+augroup PrettierFileDetect
+  autocmd BufNewFile,BufReadPost *.js setfiletype javascript
+augroup end
diff --git a/ftdetect/json.vim b/ftdetect/json.vim
index 4901b4f..dd89e7c 100644
--- a/ftdetect/json.vim
+++ b/ftdetect/json.vim
@@ -1 +1,3 @@
-autocmd BufNewFile,BufReadPost *.json setfiletype json
+augroup PrettierFileDetect
+  autocmd BufNewFile,BufReadPost *.json setfiletype json
+augroup end
diff --git a/ftdetect/less.vim b/ftdetect/less.vim
index d4bc35d..2d404bd 100644
--- a/ftdetect/less.vim
+++ b/ftdetect/less.vim
@@ -1 +1,3 @@
-autocmd BufNewFile,BufReadPost *.less setfiletype less
+augroup PrettierFileDetect
+  autocmd BufNewFile,BufReadPost *.less setfiletype less
+augroup end
diff --git a/ftdetect/markdown.vim b/ftdetect/markdown.vim
index 218f5de..a59a509 100644
--- a/ftdetect/markdown.vim
+++ b/ftdetect/markdown.vim
@@ -1 +1,3 @@
-autocmd BufNewFile,BufReadPost *.markdown,*.md,*.mdown,*.mkd,*.mkdn setfiletype markdown
+augroup PrettierFileDetect
+  autocmd BufNewFile,BufReadPost *.markdown,*.md,*.mdown,*.mkd,*.mkdn setfiletype markdown
+augroup end
diff --git a/ftdetect/scss.vim b/ftdetect/scss.vim
index 15344b1..8ff835f 100644
--- a/ftdetect/scss.vim
+++ b/ftdetect/scss.vim
@@ -1 +1,3 @@
-autocmd BufNewFile,BufReadPost *.scss setfiletype scss
+augroup PrettierFileDetect
+  autocmd BufNewFile,BufReadPost *.scss setfiletype scss
+augroup end
diff --git a/ftdetect/typescript.vim b/ftdetect/typescript.vim
index 688c2e3..501b75b 100644
--- a/ftdetect/typescript.vim
+++ b/ftdetect/typescript.vim
@@ -1 +1,3 @@
-autocmd BufNewFile,BufReadPost *.ts setfiletype typescript
+augroup PrettierFileDetect
+  autocmd BufNewFile,BufReadPost *.ts setfiletype typescript
+augroup end
diff --git a/ftdetect/vue.vim b/ftdetect/vue.vim
index c922623..354caa3 100644
--- a/ftdetect/vue.vim
+++ b/ftdetect/vue.vim
@@ -1 +1,3 @@
-autocmd BufNewFile,BufReadPost *.vue setfiletype vue
+augroup PrettierFileDetect
+  autocmd BufNewFile,BufReadPost *.vue setfiletype vue
+augroup end
diff --git a/ftdetect/yaml.vim b/ftdetect/yaml.vim
new file mode 100644
index 0000000..93f70eb
--- /dev/null
+++ b/ftdetect/yaml.vim
@@ -0,0 +1,3 @@
+augroup PrettierFileDetect
+  autocmd BufNewFile,BufReadPost *.yaml,*.yml setfiletype yaml
+augroup end
diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim
new file mode 100644
index 0000000..ce67a09
--- /dev/null
+++ b/ftplugin/yaml.vim
@@ -0,0 +1,10 @@
+let b:prettier_ft_default_args = {
+  \ 'parser': 'yaml',
+  \ }
+
+augroup Prettier
+  autocmd!
+  if g:prettier#autoformat
+    autocmd BufWritePre *.yaml call prettier#Autoformat()
+  endif
+augroup end