From bea51845924b743e2aa6e3a16e0729e67041fa9c Mon Sep 17 00:00:00 2001 From: mitermayer Date: Tue, 3 Oct 2017 22:49:04 -0700 Subject: bug: Fixing config overwrite value for non js by levaraging --stdin-filepath from prettier --- autoload/prettier.vim | 2 ++ ftplugin/css.vim | 5 ----- ftplugin/graphql.vim | 5 ----- ftplugin/json.vim | 6 ------ ftplugin/less.vim | 5 ----- ftplugin/scss.vim | 5 ----- ftplugin/typescript.vim | 5 ----- package.json | 2 +- 8 files changed, 3 insertions(+), 32 deletions(-) diff --git a/autoload/prettier.vim b/autoload/prettier.vim index d2b0a7f..d3caa50 100644 --- a/autoload/prettier.vim +++ b/autoload/prettier.vim @@ -213,6 +213,8 @@ function! s:Get_Prettier_Exec_Args(config) abort \ get(a:config, 'parser', g:prettier#config#parser) . \ ' --config-precedence ' . \ get(a:config, 'configPrecedence', g:prettier#config#config_precedence) . + \ ' --stdin-filepath ' . + \ simplify(expand("%:t")) . \ ' --stdin ' return l:cmd endfunction diff --git a/ftplugin/css.vim b/ftplugin/css.vim index e054380..bc2aec7 100644 --- a/ftplugin/css.vim +++ b/ftplugin/css.vim @@ -1,8 +1,3 @@ -let b:prettier_ft_default_args = { - \ 'parser': 'css', - \ 'configPrecedence': 'cli-override', - \ } - augroup Prettier autocmd! if g:prettier#autoformat diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim index b1905e3..bc2aec7 100644 --- a/ftplugin/graphql.vim +++ b/ftplugin/graphql.vim @@ -1,8 +1,3 @@ -let b:prettier_ft_default_args = { - \ 'parser': 'graphql', - \ 'configPrecedence': 'cli-override', - \ } - augroup Prettier autocmd! if g:prettier#autoformat diff --git a/ftplugin/json.vim b/ftplugin/json.vim index e911839..bc2aec7 100644 --- a/ftplugin/json.vim +++ b/ftplugin/json.vim @@ -1,9 +1,3 @@ -let b:prettier_ft_default_args = { - \ 'parser': 'json', - \ 'trailingComma': 'none', - \ 'configPrecedence': 'cli-override', - \ } - augroup Prettier autocmd! if g:prettier#autoformat diff --git a/ftplugin/less.vim b/ftplugin/less.vim index a959e7c..bc2aec7 100644 --- a/ftplugin/less.vim +++ b/ftplugin/less.vim @@ -1,8 +1,3 @@ -let b:prettier_ft_default_args = { - \ 'parser': 'less', - \ 'configPrecedence': 'cli-override', - \ } - augroup Prettier autocmd! if g:prettier#autoformat diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim index f20fc25..bc2aec7 100644 --- a/ftplugin/scss.vim +++ b/ftplugin/scss.vim @@ -1,8 +1,3 @@ -let b:prettier_ft_default_args = { - \ 'parser': 'scss', - \ 'configPrecedence': 'cli-override', - \ } - augroup Prettier autocmd! if g:prettier#autoformat diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim index a26be67..bc2aec7 100644 --- a/ftplugin/typescript.vim +++ b/ftplugin/typescript.vim @@ -1,8 +1,3 @@ -let b:prettier_ft_default_args = { - \ 'parser': 'typescript', - \ 'configPrecedence': 'cli-override', - \ } - augroup Prettier autocmd! if g:prettier#autoformat diff --git a/package.json b/package.json index 9ef941e..d93abfb 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,6 @@ "url": "git://github.com/prettier/vim-prettier.git" }, "dependencies": { - "prettier": "^1.7.2" + "prettier": "^1.7.4" } } -- cgit v1.3