From cce99c41ffb9a66e7036b857be2a42b5c573da00 Mon Sep 17 00:00:00 2001 From: Jan Brauer Date: Tue, 21 Aug 2018 08:21:19 +0200 Subject: Add yaml support --- ftdetect/yaml.vim | 1 + ftplugin/yaml.vim | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 ftdetect/yaml.vim create mode 100644 ftplugin/yaml.vim diff --git a/ftdetect/yaml.vim b/ftdetect/yaml.vim new file mode 100644 index 0000000..ecad6aa --- /dev/null +++ b/ftdetect/yaml.vim @@ -0,0 +1 @@ +autocmd BufNewFile,BufReadPost *.yaml,*.yml setfiletype yaml 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 -- cgit v1.3 From 9e4fccf911d05be0ade529b02a586c90bdbd9304 Mon Sep 17 00:00:00 2001 From: Jan Brauer Date: Tue, 21 Aug 2018 08:39:41 +0200 Subject: vim-vint only works with Python 3 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 957cc9c..5cde9c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ --- language: python +python: + - "3.6" dist: precise install: - pip install vim-vint -- cgit v1.3 From 52c02ba251050bb1caeba0284a535545ab541f38 Mon Sep 17 00:00:00 2001 From: Jan Brauer Date: Tue, 21 Aug 2018 08:44:50 +0200 Subject: Remove Ubuntu version deprecated by Travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5cde9c9..e700563 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: python python: - "3.6" -dist: precise install: - pip install vim-vint script: -- cgit v1.3 From 334728daee2f48f81317f64066d4a7b9aa8ccd0f Mon Sep 17 00:00:00 2001 From: mitermayer Date: Mon, 5 Nov 2018 13:47:13 -0800 Subject: Fixing linting rules - Making sure that we group filedetect into its own groups --- ftdetect/css.vim | 4 +++- ftdetect/graphql.vim | 4 +++- ftdetect/javascript.vim | 4 +++- ftdetect/json.vim | 4 +++- ftdetect/less.vim | 4 +++- ftdetect/markdown.vim | 4 +++- ftdetect/scss.vim | 4 +++- ftdetect/typescript.vim | 4 +++- ftdetect/vue.vim | 4 +++- 9 files changed, 27 insertions(+), 9 deletions(-) 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 -- cgit v1.3 From ce9dcfd331854ab04ab84bede8a1171cc288b68c Mon Sep 17 00:00:00 2001 From: mitermayer Date: Mon, 5 Nov 2018 13:49:48 -0800 Subject: Including pathlib --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 957cc9c..eccfdac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: python dist: precise install: + - pip install pathlib - pip install vim-vint script: - vint . -- cgit v1.3 From 53315e41544cc42684dbfec71ce0217f5c6a71df Mon Sep 17 00:00:00 2001 From: mitermayer Date: Mon, 5 Nov 2018 13:54:16 -0800 Subject: Debugging new vint pip dependencies --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index eccfdac..a8ca7b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: python dist: precise install: - - pip install pathlib - - pip install vim-vint + - pip install pathlib typing vim-vint script: - vint . -- cgit v1.3 From 1f0fb80394796b075554bd069494659e35bc1821 Mon Sep 17 00:00:00 2001 From: mitermayer Date: Mon, 5 Nov 2018 13:58:44 -0800 Subject: Adding enum dep --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a8ca7b2..1f07db3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,6 @@ language: python dist: precise install: - - pip install pathlib typing vim-vint + - pip install enum34 pathlib typing vim-vint script: - vint . -- cgit v1.3 From 24c1b1dc7e9fe14f2346143a08cb97125ac25da9 Mon Sep 17 00:00:00 2001 From: mitermayer Date: Mon, 5 Nov 2018 14:09:25 -0800 Subject: Fixing linting for yaml detect file --- ftdetect/yaml.vim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ftdetect/yaml.vim b/ftdetect/yaml.vim index ecad6aa..93f70eb 100644 --- a/ftdetect/yaml.vim +++ b/ftdetect/yaml.vim @@ -1 +1,3 @@ -autocmd BufNewFile,BufReadPost *.yaml,*.yml setfiletype yaml +augroup PrettierFileDetect + autocmd BufNewFile,BufReadPost *.yaml,*.yml setfiletype yaml +augroup end -- cgit v1.3 From 294233e80dc2732790e16bd37554aa76a01454a6 Mon Sep 17 00:00:00 2001 From: mitermayer Date: Mon, 5 Nov 2018 14:19:33 -0800 Subject: Adding yaml ref to the docs --- README.md | 8 ++++---- doc/prettier.txt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5df2a7e..0c8a708 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: @@ -148,14 +148,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: @@ -165,7 +165,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 59078b8..c7f24e7 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: > @@ -119,19 +119,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 -- cgit v1.3