From a564d8a356cb45bf6f438dfd1a5eaa50884b1f7a Mon Sep 17 00:00:00 2001 From: mitermayer Date: Mon, 5 Nov 2018 14:20:39 -0800 Subject: On python3.6 we dont need those extra pip deps to be declared --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a709b20..e700563 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,6 @@ language: python python: - "3.6" install: - - pip install enum34 pathlib typing vim-vint + - pip install vim-vint script: - vint . -- cgit v1.3 From 285ea5b86524fda3121435bfb2be4c514da50dcf Mon Sep 17 00:00:00 2001 From: premithk Date: Wed, 7 Nov 2018 17:30:06 +0530 Subject: Upgraded prettier version to 1.15 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 901597e..cdad3dc 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,6 @@ "url": "git://github.com/prettier/vim-prettier.git" }, "dependencies": { - "prettier": "^1.10.2" + "prettier": "^1.15.1" } } -- cgit v1.3 From 6b5dd4c32ca5176c59b756746f1d023016115c06 Mon Sep 17 00:00:00 2001 From: premithk Date: Wed, 7 Nov 2018 17:30:34 +0530 Subject: Added html formatting --- ftdetect/html.vim | 3 +++ ftplugin/html.vim | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 ftdetect/html.vim create mode 100644 ftplugin/html.vim diff --git a/ftdetect/html.vim b/ftdetect/html.vim new file mode 100644 index 0000000..50e66b3 --- /dev/null +++ b/ftdetect/html.vim @@ -0,0 +1,3 @@ +augroup PrettierFileDetect + autocmd BufNewFile,BufReadPost *.html setfiletype html +augroup end diff --git a/ftplugin/html.vim b/ftplugin/html.vim new file mode 100644 index 0000000..e34931a --- /dev/null +++ b/ftplugin/html.vim @@ -0,0 +1,10 @@ +let b:prettier_ft_default_args = { + \ 'parser': 'html', + \ } + +augroup Prettier + autocmd! + if g:prettier#autoformat + autocmd BufWritePre *.html call prettier#Autoformat() + endif +augroup end -- cgit v1.3 From f2755ec6fe465fb6af051a254d826018dcde2a50 Mon Sep 17 00:00:00 2001 From: mitermayer Date: Wed, 7 Nov 2018 20:53:54 -0800 Subject: Updating doc references to the newly included html support --- README.md | 8 ++++---- doc/prettier.txt | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0c8a708..b8e2ae2 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', 'yaml'] } + \ 'for': ['javascript', 'typescript', 'css', 'less', 'scss', 'json', 'graphql', 'markdown', 'vue', 'yaml', 'html'] } ``` 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,*.yaml Prettier +autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml,*.html 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,*.yaml PrettierAsync +autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml,*.html 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,*.yaml PrettierAsync +autocmd BufWritePre,TextChanged,InsertLeave *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml,*.html PrettierAsync ``` ### Overwrite default prettier configuration diff --git a/doc/prettier.txt b/doc/prettier.txt index c7f24e7..7e9e863 100644 --- a/doc/prettier.txt +++ b/doc/prettier.txt @@ -47,7 +47,8 @@ node and yarn|npm installed globally. Plug 'prettier/vim-prettier', { \ 'do': 'yarn install', \ 'for': ['javascript', 'typescript', 'css', - \ 'less', 'scss', 'json', 'graphql', 'markdown', 'vue', 'yaml'] } + \ 'less', 'scss', 'json', 'graphql', 'markdown', 'vue', 'yaml', + 'html'] } < or simply enable for all formats by: > @@ -119,19 +120,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,*.yaml Prettier + autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml,*.html 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,*.yaml PrettierAsync + autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml,*.html 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,*.yaml PrettierAsync + autocmd BufWritePre,TextChanged,InsertLeave *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml,*.html PrettierAsync < Overwrite default prettier configuration -- cgit v1.3