diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | doc/prettier.txt | 9 | ||||
| -rw-r--r-- | ftdetect/html.vim | 3 | ||||
| -rw-r--r-- | ftplugin/html.vim | 10 | ||||
| -rw-r--r-- | package.json | 2 |
6 files changed, 24 insertions, 10 deletions
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 . @@ -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: @@ -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,*.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: @@ -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,*.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 5b6c1a4..b631657 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: > @@ -136,19 +137,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 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 diff --git a/package.json b/package.json index fc61873..a390ea6 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,6 @@ "@prettier/plugin-php": "^0.9.0", "@prettier/plugin-python": "prettier/plugin-python", "@prettier/plugin-swift": "prettier/plugin-swift", - "prettier": "^1.10.2" + "prettier": "^1.15.1" } } |