From a3df2e771010f9c70e74fadda32dd81a28b88f4f Mon Sep 17 00:00:00 2001 From: mitermayer Date: Tue, 6 Jun 2017 11:38:29 -0700 Subject: Bumping support to latest prettier ^1.4.X and enabling support for autofomat css, less, scss, sass and typescript files --- autoload/prettier.vim | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'autoload/prettier.vim') diff --git a/autoload/prettier.vim b/autoload/prettier.vim index 249ffb1..66166f4 100644 --- a/autoload/prettier.vim +++ b/autoload/prettier.vim @@ -3,13 +3,10 @@ let s:root_dir = fnamemodify(resolve(expand(':p')), ':h') function! prettier#Prettier(...) abort let l:execCmd = s:Get_Prettier_Exec() let l:async = a:0 > 0 ? a:1 : 0 - - if &ft !~ 'javascript' - return - endif + let l:config = getbufvar(bufnr('%'), 'prettier_ft_default_args', {}) if l:execCmd != -1 - let l:cmd = l:execCmd . s:Get_Prettier_Exec_Args() + let l:cmd = l:execCmd . s:Get_Prettier_Exec_Args(l:config) " close quickfix call setqflist([]) @@ -124,25 +121,27 @@ endfunction " By default we will default to our internal " configuration settings for prettier -function! s:Get_Prettier_Exec_Args() abort +function! s:Get_Prettier_Exec_Args(config) abort + " Allow params to be passed as json format + " convert bellow usage of globals to a get function o the params defaulting to global let l:cmd = ' --print-width ' . - \ g:prettier#config#print_width . + \ get(a:config, 'printWidth', g:prettier#config#print_width) . \ ' --tab-width ' . - \ g:prettier#config#tab_width . + \ get(a:config, 'tabWidth', g:prettier#config#tab_width) . \ ' --use-tabs ' . - \ g:prettier#config#use_tabs . + \ get(a:config, 'useTabs', g:prettier#config#use_tabs) . \ ' --semi ' . - \ g:prettier#config#semi . + \ get(a:config, 'semi', g:prettier#config#semi) . \ ' --single-quote ' . - \ g:prettier#config#single_quote . + \ get(a:config, 'singleQuote', g:prettier#config#single_quote) . \ ' --bracket-spacing ' . - \ g:prettier#config#bracket_spacing . + \ get(a:config, 'bracketSpacing', g:prettier#config#bracket_spacing) . \ ' --jsx-bracket-same-line ' . - \ g:prettier#config#jsx_bracket_same_line . + \ get(a:config, 'jsxBracketSameLine', g:prettier#config#jsx_bracket_same_line) . \ ' --trailing-comma ' . - \ g:prettier#config#trailing_comma . + \ get(a:config, 'trailingComma', g:prettier#config#trailing_comma) . \ ' --parser ' . - \ g:prettier#config#parser . + \ get(a:config, 'parser', g:prettier#config#parser) . \ ' --stdin ' return cmd endfunction -- cgit v1.3-5-g45d5