From 58ffa35566d2d84db4c57612e4d10dae2276e6a9 Mon Sep 17 00:00:00 2001 From: mitermayer Date: Fri, 29 Sep 2017 21:12:42 -0700 Subject: WIP --- autoload/prettier.vim | 2 +- ftplugin/css.vim | 2 +- ftplugin/less.vim | 2 +- ftplugin/scss.vim | 2 +- package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autoload/prettier.vim b/autoload/prettier.vim index c217a58..d2b0a7f 100644 --- a/autoload/prettier.vim +++ b/autoload/prettier.vim @@ -214,7 +214,7 @@ function! s:Get_Prettier_Exec_Args(config) abort \ ' --config-precedence ' . \ get(a:config, 'configPrecedence', g:prettier#config#config_precedence) . \ ' --stdin ' - return cmd + return l:cmd endfunction " By default we will search for the following diff --git a/ftplugin/css.vim b/ftplugin/css.vim index f268f42..6a736cb 100644 --- a/ftplugin/css.vim +++ b/ftplugin/css.vim @@ -1,5 +1,5 @@ let b:prettier_ft_default_args = { - \ 'parser': 'postcss' + \ 'parser': 'css' \ } augroup Prettier diff --git a/ftplugin/less.vim b/ftplugin/less.vim index f268f42..fca0413 100644 --- a/ftplugin/less.vim +++ b/ftplugin/less.vim @@ -1,5 +1,5 @@ let b:prettier_ft_default_args = { - \ 'parser': 'postcss' + \ 'parser': 'less' \ } augroup Prettier diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim index f268f42..9d89736 100644 --- a/ftplugin/scss.vim +++ b/ftplugin/scss.vim @@ -1,5 +1,5 @@ let b:prettier_ft_default_args = { - \ 'parser': 'postcss' + \ 'parser': 'scss' \ } augroup Prettier diff --git a/package.json b/package.json index a0f4832..adf9cf5 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,6 @@ "url": "git://github.com/prettier/vim-prettier.git" }, "dependencies": { - "prettier": "1.7.1" + "prettier": "^1.7.2" } } -- cgit v1.3 From dd9a499137237dc27038f414ea460ada6b79ace7 Mon Sep 17 00:00:00 2001 From: mitermayer Date: Fri, 29 Sep 2017 21:46:01 -0700 Subject: Seeting config override cli-override for non javascript --- ftplugin/css.vim | 3 ++- ftplugin/graphql.vim | 3 ++- ftplugin/json.vim | 3 ++- ftplugin/less.vim | 3 ++- ftplugin/scss.vim | 3 ++- ftplugin/typescript.vim | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ftplugin/css.vim b/ftplugin/css.vim index 6a736cb..e054380 100644 --- a/ftplugin/css.vim +++ b/ftplugin/css.vim @@ -1,5 +1,6 @@ let b:prettier_ft_default_args = { - \ 'parser': 'css' + \ 'parser': 'css', + \ 'configPrecedence': 'cli-override', \ } augroup Prettier diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim index bfb7b34..b1905e3 100644 --- a/ftplugin/graphql.vim +++ b/ftplugin/graphql.vim @@ -1,5 +1,6 @@ let b:prettier_ft_default_args = { - \ 'parser': 'graphql' + \ 'parser': 'graphql', + \ 'configPrecedence': 'cli-override', \ } augroup Prettier diff --git a/ftplugin/json.vim b/ftplugin/json.vim index 179e630..e911839 100644 --- a/ftplugin/json.vim +++ b/ftplugin/json.vim @@ -1,6 +1,7 @@ let b:prettier_ft_default_args = { \ 'parser': 'json', - \ 'trailingComma': 'none' + \ 'trailingComma': 'none', + \ 'configPrecedence': 'cli-override', \ } augroup Prettier diff --git a/ftplugin/less.vim b/ftplugin/less.vim index fca0413..a959e7c 100644 --- a/ftplugin/less.vim +++ b/ftplugin/less.vim @@ -1,5 +1,6 @@ let b:prettier_ft_default_args = { - \ 'parser': 'less' + \ 'parser': 'less', + \ 'configPrecedence': 'cli-override', \ } augroup Prettier diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim index 9d89736..f20fc25 100644 --- a/ftplugin/scss.vim +++ b/ftplugin/scss.vim @@ -1,5 +1,6 @@ let b:prettier_ft_default_args = { - \ 'parser': 'scss' + \ 'parser': 'scss', + \ 'configPrecedence': 'cli-override', \ } augroup Prettier diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim index 8151c09..a26be67 100644 --- a/ftplugin/typescript.vim +++ b/ftplugin/typescript.vim @@ -1,5 +1,6 @@ let b:prettier_ft_default_args = { - \ 'parser': 'typescript' + \ 'parser': 'typescript', + \ 'configPrecedence': 'cli-override', \ } augroup Prettier -- cgit v1.3