diff options
| -rw-r--r-- | README.md | 31 | ||||
| -rw-r--r-- | autoload/prettier/resolver/config.vim | 112 |
2 files changed, 3 insertions, 140 deletions
@@ -1,4 +1,4 @@ -## vim-prettier +## vim-prettier A vim plugin wrapper for prettier, pre-configured with custom default prettier settings. @@ -20,7 +20,7 @@ By default it will auto format **javascript**, **typescript**, **less**, **scss**, **css**, **json**, **graphql** and **markdown** files if they have/support the "@format" pragma annotation in the header of the file. - + ### INSTALL @@ -32,6 +32,7 @@ git clone https://github.com/prettier/vim-prettier ~/.vim/pack/plugins/start/vim ``` `.vimrc`: + ```vim packloadall ``` @@ -241,37 +242,11 @@ autocmd TextChanged,InsertLeave *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss, However they can be configured by: ```vim -" Max line length that prettier will wrap on: a number or 'auto' (use -" textwidth). -" default: 'auto' -let g:prettier#config#print_width = 'auto' - -" number of spaces per indentation level: a number or 'auto' (use -" softtabstop) -" default: 'auto' -let g:prettier#config#tab_width = 'auto' - -" use tabs instead of spaces: true, false, or auto (use the expandtab setting). -" default: 'auto' -let g:prettier#config#use_tabs = 'auto' - " flow|babylon|typescript|css|less|scss|json|graphql|markdown or empty string " (let prettier choose). " default: '' let g:prettier#config#parser = '' -" cli-override|file-override|prefer-file -" default: 'file-override' -let g:prettier#config#config_precedence = 'file-override' - -" always|never|preserve -" default: 'preserve' -let g:prettier#config#prose_wrap = 'preserve' - -" css|strict|ignore -" default: 'css' -let g:prettier#config#html_whitespace_sensitivity = 'css' - " false|true " default: 'false' let g:prettier#config#require_pragma = 'false' diff --git a/autoload/prettier/resolver/config.vim b/autoload/prettier/resolver/config.vim index 7a9d813..0c64100 100644 --- a/autoload/prettier/resolver/config.vim +++ b/autoload/prettier/resolver/config.vim @@ -42,56 +42,6 @@ function! s:Flag_range_end(config_and_sel, ...) abort return '--range-end=' . l:rangeEnd endfunction -" Returns '--tab-width=NN' -function! s:Flag_tab_width(config_and_sel, ...) abort - let l:value = get( - \ a:config_and_sel.config, - \ 'tabWidth', - \ g:prettier#config#tab_width) - - if (l:value ==# 'auto') - let l:value = prettier#utils#shim#shiftwidth() - endif - - return '--tab-width=' . l:value -endfunction - -" Returns either '--use-tabs' or an empty string. -function! s:Flag_use_tabs(config_and_sel, ...) abort - let l:value = get( - \ a:config_and_sel.config, - \ 'useTabs', - \ g:prettier#config#use_tabs) - - if (l:value ==# 'auto') - let l:value = &expandtab ? 'false' : 'true' - endif - - if ( l:value ==# 'true' ) - return ' --use-tabs' - else - return '' - endif -endfunction - -" Returns '--print-width=NN' or '' -function! s:Flag_print_width(config_and_sel, ...) abort - let l:value = get( - \ a:config_and_sel.config, - \ 'printWidth', - \ g:prettier#config#print_width) - - if (l:value ==# 'auto') - let l:value = &textwidth - endif - - if (l:value > 0) - return '--print-width=' . l:value - else - return '' - endif -endfunction - " Returns '--parser=PARSER' or '' function! s:Flag_parser(config_and_sel, ...) abort let l:value = get( @@ -144,18 +94,6 @@ endfunction let s:concat_value = function('s:Concat_value_to_flag') let s:FLAGS = { - \ '--use-tabs': { - \ 'json_name': 'useTabs', - \ 'global_name': 'use_tabs', - \ 'mapper': function('s:Flag_use_tabs')}, - \ '--tab-width': { - \ 'json_name': 'tabWidth', - \ 'global_name': 'tab_width', - \ 'mapper': function('s:Flag_tab_width')}, - \ '--print-width': { - \ 'json_name': 'printWidth', - \ 'global_name': 'print_width', - \ 'mapper': function('s:Flag_print_width')}, \ '--parser': { \ 'json_name': 'parser', \ 'global_name': 'parser', @@ -168,51 +106,6 @@ let s:FLAGS = { \ 'json_name': '', \ 'global_name': '', \ 'mapper': function('s:Flag_range_end')}, - \ '--semi': { - \ 'json_name': 'semi', - \ 'global_name': 'semi', - \ 'mapper': s:concat_value}, - \ '--single-quote': { - \ 'json_name': 'singleQuote', - \ 'global_name': 'single_quote', - \ 'mapper': s:concat_value}, - \ '--bracket-spacing': { - \ 'json_name': 'bracketSpacing', - \ 'global_name': 'bracket_spacing', - \ 'mapper': s:concat_value}, - \ '--bracket-same-line': { - \ 'json_name': 'bracketSameLine', - \ 'global_name': 'bracket_same_line', - \ 'mapper': s:concat_value, - \ 'since': '2.4.0'}, - \ '--jsx-bracket-same-line': { - \ 'json_name': 'jsxBracketSameLine', - \ 'global_name': 'jsx_bracket_same_line', - \ 'mapper': s:concat_value, - \ 'deprecated': '2.4.0'}, - \ '--arrow-parens': { - \ 'json_name': 'arrowParens', - \ 'global_name': 'arrow_parens', - \ 'mapper': s:concat_value, - \ 'since': '1.9.0'}, - \ '--trailing-comma': { - \ 'json_name': 'trailingComma', - \ 'global_name': 'trailing_comma', - \ 'mapper': s:concat_value}, - \ '--config-precedence': { - \ 'json_name': 'configPrecedence', - \ 'global_name': 'config_precedence', - \ 'mapper': s:concat_value}, - \ '--prose-wrap': { - \ 'json_name': 'proseWrap', - \ 'global_name': 'prose_wrap', - \ 'mapper': s:concat_value, - \ 'since': '1.8.2'}, - \ '--html-whitespace-sensitivity': { - \ 'json_name': 'htmlWhitespaceSensitivity', - \ 'global_name': 'html_whitespace_sensitivity', - \ 'mapper': s:concat_value, - \ 'since': '1.15.0'}, \ '--stdin-filepath': { \ 'json_name': '', \ 'global_name': '', @@ -232,11 +125,6 @@ let s:FLAGS = { \ 'global_name': '', \ 'mapper': function('s:Flag_loglevel'), \ 'deprecated': '3.0.0'}, - \ '--log-level': { - \ 'json_name': '', - \ 'global_name': '', - \ 'mapper': function('s:Flag_loglevel'), - \ 'since': '3.0.0'}, \ '--stdin': { \ 'json_name': '', \ 'global_name': '', |