diff options
| author | mitermayer <mitermayer.reis@gmail.com> | 2017-09-29 21:48:31 -0700 |
|---|---|---|
| committer | mitermayer <mitermayer.reis@gmail.com> | 2017-09-29 21:48:31 -0700 |
| commit | e4bba0393fd9e2ee6a58866a321b26c5f50776b3 (patch) | |
| tree | ed57fb93e89e1c3554110d217811eaa69b6167df | |
| parent | eb56540a73e3d207120c2f6facfeee73354b730c (diff) | |
| parent | dd9a499137237dc27038f414ea460ada6b79ace7 (diff) | |
| download | vim-prettier-e4bba0393fd9e2ee6a58866a321b26c5f50776b3.tar.xz | |
Merge branch 'issue/59-handling-prettier-deprecated-warnings'0.1.3
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | autoload/prettier.vim | 2 | ||||
| -rw-r--r-- | ftplugin/css.vim | 3 | ||||
| -rw-r--r-- | ftplugin/graphql.vim | 3 | ||||
| -rw-r--r-- | ftplugin/json.vim | 3 | ||||
| -rw-r--r-- | ftplugin/less.vim | 3 | ||||
| -rw-r--r-- | ftplugin/scss.vim | 3 | ||||
| -rw-r--r-- | ftplugin/typescript.vim | 3 | ||||
| -rw-r--r-- | package.json | 2 |
9 files changed, 15 insertions, 9 deletions
@@ -2,7 +2,7 @@ A vim plugin wrapper for prettier, pre-configured with custom default prettier settings. -**Note:** requires `prettier` version 1.7.0 +**Note:** requires `prettier` version 1.7.0+ *** 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..e054380 100644 --- a/ftplugin/css.vim +++ b/ftplugin/css.vim @@ -1,5 +1,6 @@ let b:prettier_ft_default_args = { - \ 'parser': 'postcss' + \ '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 f268f42..a959e7c 100644 --- a/ftplugin/less.vim +++ b/ftplugin/less.vim @@ -1,5 +1,6 @@ let b:prettier_ft_default_args = { - \ 'parser': 'postcss' + \ 'parser': 'less', + \ 'configPrecedence': 'cli-override', \ } augroup Prettier diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim index f268f42..f20fc25 100644 --- a/ftplugin/scss.vim +++ b/ftplugin/scss.vim @@ -1,5 +1,6 @@ let b:prettier_ft_default_args = { - \ 'parser': 'postcss' + \ '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 diff --git a/package.json b/package.json index 9eab75a..adf9cf5 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,6 @@ "url": "git://github.com/prettier/vim-prettier.git" }, "dependencies": { - "prettier": "1.7.0" + "prettier": "^1.7.2" } } |