diff options
| author | w0rp <devw0rp@gmail.com> | 2017-08-30 22:49:46 +0100 |
|---|---|---|
| committer | w0rp <devw0rp@gmail.com> | 2017-08-30 22:49:46 +0100 |
| commit | f36f38c960eab386ad1a2752ae3d6265875a3cff (patch) | |
| tree | fcf568ebb9d39cb3c4058fac7fb1fbf84ddd203a /autoload | |
| parent | 301d30229b10bf08094a6bd368c102cf25753dc9 (diff) | |
| download | ale-f36f38c960eab386ad1a2752ae3d6265875a3cff.zip | |
Cover the prettier-eslint changes with tests, and fix some problems
Diffstat (limited to 'autoload')
| -rw-r--r-- | autoload/ale/fixers/prettier_eslint.vim | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/autoload/ale/fixers/prettier_eslint.vim b/autoload/ale/fixers/prettier_eslint.vim index 6fe9f0bc..dbf0424c 100644 --- a/autoload/ale/fixers/prettier_eslint.vim +++ b/autoload/ale/fixers/prettier_eslint.vim @@ -2,6 +2,15 @@ " w0rp <devw0rp@gmail.com>, morhetz (Pavel Pertsev) <morhetz@gmail.com> " Description: Integration between Prettier and ESLint. +function! ale#fixers#prettier_eslint#SetOptionDefaults() abort + call ale#Set('javascript_prettier_eslint_executable', 'prettier-eslint') + call ale#Set('javascript_prettier_eslint_use_global', 0) + call ale#Set('javascript_prettier_eslint_options', '') + call ale#Set('javascript_prettier_eslint_legacy', 0) +endfunction + +call ale#fixers#prettier_eslint#SetOptionDefaults() + function! s:FindConfig(buffer) abort for l:filename in [ \ '.eslintrc.js', @@ -21,11 +30,6 @@ function! s:FindConfig(buffer) abort return '' endfunction -call ale#Set('javascript_prettier_eslint_executable', 'prettier-eslint') -call ale#Set('javascript_prettier_eslint_use_global', 0) -call ale#Set('javascript_prettier_eslint_options', '') -call ale#Set('javascript_prettier_eslint_legacy', 0) - function! ale#fixers#prettier_eslint#GetExecutable(buffer) abort return ale#node#FindExecutable(a:buffer, 'javascript_prettier_eslint', [ \ 'node_modules/prettier-eslint-cli/dist/index.js', @@ -33,21 +37,22 @@ function! ale#fixers#prettier_eslint#GetExecutable(buffer) abort \]) endfunction -function! ale#fixers#prettier_eslint#Fix(buffer, lines) abort +function! ale#fixers#prettier_eslint#Fix(buffer) abort let l:options = ale#Var(a:buffer, 'javascript_prettier_eslint_options') let l:executable = ale#fixers#prettier_eslint#GetExecutable(a:buffer) - let l:config = s:FindConfig(a:buffer) - let l:eslint_config_option = ' --eslint-config-path ' . ale#Escape(l:config) - if ale#Var(a:buffer, 'javascript_prettier_eslint_legacy') - let l:eslint_config_option = '' - endif + let l:config = !ale#Var(a:buffer, 'javascript_prettier_eslint_legacy') + \ ? s:FindConfig(a:buffer) + \ : '' + let l:eslint_config_option = !empty(l:config) + \ ? ' --eslint-config-path ' . ale#Escape(l:config) + \ : '' return { \ 'command': ale#Escape(l:executable) \ . ' %t' \ . l:eslint_config_option - \ . ' ' . l:options + \ . (!empty(l:options) ? ' ' . l:options : '') \ . ' --write', \ 'read_temporary_file': 1, \} |