Skip to content

Commit e4bba03

Browse files
committed
Merge branch 'issue/59-handling-prettier-deprecated-warnings'
2 parents eb56540 + dd9a499 commit e4bba03

File tree

9 files changed

+15
-9
lines changed

9 files changed

+15
-9
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
A vim plugin wrapper for prettier, pre-configured with custom default prettier settings.
44

5-
**Note:** requires `prettier` version 1.7.0
5+
**Note:** requires `prettier` version 1.7.0+
66

77
***
88

autoload/prettier.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ function! s:Get_Prettier_Exec_Args(config) abort
214214
\ ' --config-precedence ' .
215215
\ get(a:config, 'configPrecedence', g:prettier#config#config_precedence) .
216216
\ ' --stdin '
217-
return cmd
217+
return l:cmd
218218
endfunction
219219

220220
" By default we will search for the following

ftplugin/css.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
let b:prettier_ft_default_args = {
2-
\ 'parser': 'postcss'
2+
\ 'parser': 'css',
3+
\ 'configPrecedence': 'cli-override',
34
\ }
45

56
augroup Prettier

ftplugin/graphql.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
let b:prettier_ft_default_args = {
2-
\ 'parser': 'graphql'
2+
\ 'parser': 'graphql',
3+
\ 'configPrecedence': 'cli-override',
34
\ }
45

56
augroup Prettier

ftplugin/json.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
let b:prettier_ft_default_args = {
22
\ 'parser': 'json',
3-
\ 'trailingComma': 'none'
3+
\ 'trailingComma': 'none',
4+
\ 'configPrecedence': 'cli-override',
45
\ }
56

67
augroup Prettier

ftplugin/less.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
let b:prettier_ft_default_args = {
2-
\ 'parser': 'postcss'
2+
\ 'parser': 'less',
3+
\ 'configPrecedence': 'cli-override',
34
\ }
45

56
augroup Prettier

ftplugin/scss.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
let b:prettier_ft_default_args = {
2-
\ 'parser': 'postcss'
2+
\ 'parser': 'scss',
3+
\ 'configPrecedence': 'cli-override',
34
\ }
45

56
augroup Prettier

ftplugin/typescript.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
let b:prettier_ft_default_args = {
2-
\ 'parser': 'typescript'
2+
\ 'parser': 'typescript',
3+
\ 'configPrecedence': 'cli-override',
34
\ }
45

56
augroup Prettier

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"url": "git://github.com/prettier/vim-prettier.git"
1010
},
1111
"dependencies": {
12-
"prettier": "1.7.0"
12+
"prettier": "^1.7.2"
1313
}
1414
}

0 commit comments

Comments
 (0)