diff options
| author | Adriaan Zonnenberg <adriaanzon@users.noreply.github.com> | 2018-04-07 23:53:03 +0200 |
|---|---|---|
| committer | w0rp <w0rp@users.noreply.github.com> | 2018-04-07 23:53:03 +0200 |
| commit | 121e806423830fa9e6bc1c7833f0624bd06903ff (patch) | |
| tree | bcf6b33ec006f8f0342cc4845a54f99876565024 | |
| parent | bb775e4e22d1880bd015fbc3ea7fa203c9eeb6f9 (diff) | |
| download | ale-121e806423830fa9e6bc1c7833f0624bd06903ff.zip | |
Add g:ale_php_cs_fixer_options variable (#1477)
* Add g:ale_php_cs_fixer_options variable
* Fix test
| -rw-r--r-- | autoload/ale/fixers/php_cs_fixer.vim | 8 | ||||
| -rw-r--r-- | doc/ale-php.txt | 7 | ||||
| -rw-r--r-- | test/fixers/test_php_cs_fixer.vader | 21 |
3 files changed, 31 insertions, 5 deletions
diff --git a/autoload/ale/fixers/php_cs_fixer.vim b/autoload/ale/fixers/php_cs_fixer.vim index 56aa9150..7697ba64 100644 --- a/autoload/ale/fixers/php_cs_fixer.vim +++ b/autoload/ale/fixers/php_cs_fixer.vim @@ -3,6 +3,7 @@ call ale#Set('php_cs_fixer_executable', 'php-cs-fixer') call ale#Set('php_cs_fixer_use_global', 0) +call ale#Set('php_cs_fixer_options', '') function! ale#fixers#php_cs_fixer#GetExecutable(buffer) abort return ale#node#FindExecutable(a:buffer, 'php_cs_fixer', [ @@ -14,10 +15,9 @@ endfunction function! ale#fixers#php_cs_fixer#Fix(buffer) abort let l:executable = ale#fixers#php_cs_fixer#GetExecutable(a:buffer) return { - \ 'command': ale#Escape(l:executable) . ' fix %t', + \ 'command': ale#Escape(l:executable) + \ . ' ' . ale#Var(a:buffer, 'php_cs_fixer_options') + \ . ' fix %t', \ 'read_temporary_file': 1, \} endfunction - - - diff --git a/doc/ale-php.txt b/doc/ale-php.txt index 7edfe231..52b37ea3 100644 --- a/doc/ale-php.txt +++ b/doc/ale-php.txt @@ -183,5 +183,12 @@ g:ale_php_cs_fixer_use_global *g:ale_php_cs_fixer_use_global* This variable force globally installed fixer. +g:ale_php_cs_fixer_options *g:ale_php_cs_fixer_options* + *b:ale_php_cs_fixer_options* + Type: |String| + Default: `''` + + This variable can be set to pass additional options to php-cs-fixer. + =============================================================================== vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl: diff --git a/test/fixers/test_php_cs_fixer.vader b/test/fixers/test_php_cs_fixer.vader index b6579670..b47c190c 100644 --- a/test/fixers/test_php_cs_fixer.vader +++ b/test/fixers/test_php_cs_fixer.vader @@ -1,6 +1,8 @@ Before: Save g:ale_php_cs_fixer_executable + Save g:ale_php_cs_fixer_options let g:ale_php_cs_fixer_executable = 'php-cs-fixer' + let g:ale_php_cs_fixer_options = '' call ale#test#SetDirectory('/testplugin/test/fixers') silent cd .. @@ -42,5 +44,22 @@ Execute(The php-cs-fixer callback should return the correct default values): call ale#test#SetFilename('php_paths/project-without-php-cs-fixer/foo/test.php') AssertEqual - \ {'read_temporary_file': 1, 'command': ale#Escape('php-cs-fixer') . ' fix %t' }, + \ { + \ 'read_temporary_file': 1, + \ 'command': ale#Escape('php-cs-fixer') + \ . ' ' . g:ale_php_cs_fixer_options + \ . ' fix %t' + \ }, + \ ale#fixers#php_cs_fixer#Fix(bufnr('')) + +Execute(The php-cs-fixer callback should include custom php-cs-fixer options): + let g:ale_php_cs_fixer_options = '--config="$HOME/.php_cs"' + call ale#test#SetFilename('php_paths/project-without-php-cs-fixer/test.php') + + AssertEqual + \ { + \ 'command': ale#Escape(g:ale_php_cs_fixer_executable) + \ . ' --config="$HOME/.php_cs" fix %t', + \ 'read_temporary_file': 1, + \ }, \ ale#fixers#php_cs_fixer#Fix(bufnr('')) |