From 066097e0b9eeb9066ba8974d9718c5b26b82cffc Mon Sep 17 00:00:00 2001 From: hank Date: Wed, 6 Nov 2019 10:14:12 +0800 Subject: Use `get()` to check `g:prettier#autoformat` safely in ftplugin Due to the fact that `plugin` will be loaded after `ftplugin`(http://vimdoc.sourceforge.net/htmldoc/filetype.html#ftplugin-overrule), even we set `g:prettier#autoformat` in plugin/prettier.vim, it's treated as undefined in ftplugin/*.vim. This happened when using `vim-pathogen`. --- ftplugin/css.vim | 2 +- ftplugin/graphql.vim | 2 +- ftplugin/html.vim | 2 +- ftplugin/javascript.vim | 2 +- ftplugin/json.vim | 2 +- ftplugin/less.vim | 2 +- ftplugin/markdown.vim | 2 +- ftplugin/scss.vim | 2 +- ftplugin/typescript.vim | 2 +- ftplugin/vue.vim | 2 +- ftplugin/yaml.vim | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'ftplugin') diff --git a/ftplugin/css.vim b/ftplugin/css.vim index 0ac9df5..53881ca 100644 --- a/ftplugin/css.vim +++ b/ftplugin/css.vim @@ -4,7 +4,7 @@ let b:prettier_ft_default_args = { augroup Prettier autocmd! - if g:prettier#autoformat + if get(g:, 'prettier#autoformat') autocmd BufWritePre *.css call prettier#Autoformat() endif augroup end diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim index a02ae6f..5e63e3f 100644 --- a/ftplugin/graphql.vim +++ b/ftplugin/graphql.vim @@ -4,7 +4,7 @@ let b:prettier_ft_default_args = { augroup Prettier autocmd! - if g:prettier#autoformat + if get(g:, 'prettier#autoformat') autocmd BufWritePre *.graphql,*.gql call prettier#Autoformat() endif augroup end diff --git a/ftplugin/html.vim b/ftplugin/html.vim index 76ad0af..e27828a 100644 --- a/ftplugin/html.vim +++ b/ftplugin/html.vim @@ -8,7 +8,7 @@ endif augroup Prettier autocmd! - if g:prettier#autoformat + if get(g:, 'prettier#autoformat') autocmd BufWritePre *.html call prettier#Autoformat() endif augroup end diff --git a/ftplugin/javascript.vim b/ftplugin/javascript.vim index c0f989d..dbe0694 100644 --- a/ftplugin/javascript.vim +++ b/ftplugin/javascript.vim @@ -1,6 +1,6 @@ augroup Prettier autocmd! - if g:prettier#autoformat + if get(g:, 'prettier#autoformat') autocmd BufWritePre *.js,*.jsx,*.mjs call prettier#Autoformat() endif augroup end diff --git a/ftplugin/json.vim b/ftplugin/json.vim index a8213e8..1c5ef7d 100644 --- a/ftplugin/json.vim +++ b/ftplugin/json.vim @@ -4,7 +4,7 @@ let b:prettier_ft_default_args = { augroup Prettier autocmd! - if g:prettier#autoformat + if get(g:, 'prettier#autoformat') autocmd BufWritePre *.json call prettier#Autoformat() endif augroup end diff --git a/ftplugin/less.vim b/ftplugin/less.vim index 53b8e2a..e1f18ce 100644 --- a/ftplugin/less.vim +++ b/ftplugin/less.vim @@ -4,7 +4,7 @@ let b:prettier_ft_default_args = { augroup Prettier autocmd! - if g:prettier#autoformat + if get(g:, 'prettier#autoformat') autocmd BufWritePre *.less call prettier#Autoformat() endif augroup end diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim index c74f228..94dbe0e 100644 --- a/ftplugin/markdown.vim +++ b/ftplugin/markdown.vim @@ -4,7 +4,7 @@ let b:prettier_ft_default_args = { augroup Prettier autocmd! - if g:prettier#autoformat + if get(g:, 'prettier#autoformat') autocmd BufWritePre *.markdown,*.md,*.mdown,*.mkd,*.mkdn call prettier#Autoformat() endif augroup end diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim index 9dacd64..04cd8e8 100644 --- a/ftplugin/scss.vim +++ b/ftplugin/scss.vim @@ -4,7 +4,7 @@ let b:prettier_ft_default_args = { augroup Prettier autocmd! - if g:prettier#autoformat + if get(g:, 'prettier#autoformat') autocmd BufWritePre *.scss call prettier#Autoformat() endif augroup end diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim index 4d2f588..f023d43 100644 --- a/ftplugin/typescript.vim +++ b/ftplugin/typescript.vim @@ -4,7 +4,7 @@ let b:prettier_ft_default_args = { augroup Prettier autocmd! - if g:prettier#autoformat + if get(g:, 'prettier#autoformat') autocmd BufWritePre *.ts,*.tsx call prettier#Autoformat() endif augroup end diff --git a/ftplugin/vue.vim b/ftplugin/vue.vim index cfd695d..cc9c4fd 100644 --- a/ftplugin/vue.vim +++ b/ftplugin/vue.vim @@ -4,7 +4,7 @@ let b:prettier_ft_default_args = { augroup Prettier autocmd! - if g:prettier#autoformat + if get(g:, 'prettier#autoformat') autocmd BufWritePre *.vue call prettier#Autoformat() endif augroup end diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim index ce67a09..23944c7 100644 --- a/ftplugin/yaml.vim +++ b/ftplugin/yaml.vim @@ -4,7 +4,7 @@ let b:prettier_ft_default_args = { augroup Prettier autocmd! - if g:prettier#autoformat + if get(g:, 'prettier#autoformat') autocmd BufWritePre *.yaml call prettier#Autoformat() endif augroup end -- cgit v1.3