Merge branch 'ifokeev-jsx-support'

This commit is contained in:
Chiel ten Brinke 2016-07-08 18:37:47 +02:00
commit 06251ab317

View File

@ -140,12 +140,12 @@ if !exists('g:formatdef_jsbeautify_javascript')
elseif filereadable(expand('~/.jsbeautifyrc')) elseif filereadable(expand('~/.jsbeautifyrc'))
let g:formatdef_jsbeautify_javascript = '"js-beautify"' let g:formatdef_jsbeautify_javascript = '"js-beautify"'
else else
let g:formatdef_jsbeautify_javascript = '"js-beautify -f - -".(&expandtab ? "s ".shiftwidth() : "t").(&textwidth ? " -w ".&textwidth : "")' let g:formatdef_jsbeautify_javascript = '"js-beautify -X -f - -".(&expandtab ? "s ".shiftwidth() : "t").(&textwidth ? " -w ".&textwidth : "")'
endif endif
endif endif
if !exists('g:formatdef_pyjsbeautify_javascript') if !exists('g:formatdef_pyjsbeautify_javascript')
let g:formatdef_pyjsbeautify_javascript = '"js-beautify -".(&expandtab ? "s ".shiftwidth() : "t").(&textwidth ? " -w ".&textwidth : "")." -"' let g:formatdef_pyjsbeautify_javascript = '"js-beautify -X -".(&expandtab ? "s ".shiftwidth() : "t").(&textwidth ? " -w ".&textwidth : "")." -"'
endif endif
if !exists('g:formatdef_jscs') if !exists('g:formatdef_jscs')