marc/ale
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Change _options to _project_options

Browse source
This commit is contained in:
jhlink 2020-07-28 19:48:27 -04:00
parent 0e6578cf65
commit 5377272d20
4 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
autoload/ale/fixers/astyle.vim
View file

@ -4,12 +4,13 @@
function! s:set_variables() abort
for l:ft in ['c', 'cpp']
call ale#Set(l:ft . '_astyle_executable', 'astyle')
call ale#Set(l:ft . '_astyle_options', '')
call ale#Set(l:ft . '_astyle_project_options', '')
endfor
endfunction
call s:set_variables()
function! ale#fixers#astyle#Var(buffer, name) abort
let l:ft = getbufvar(str2nr(a:buffer), '&filetype')
let l:ft = l:ft =~# 'cpp' ? 'cpp' : 'c'
@ -20,7 +21,7 @@ endfunction
function! ale#fixers#astyle#Fix(buffer) abort
let l:executable = ale#fixers#astyle#Var(a:buffer, 'executable')
let l:filename = ale#Escape(bufname(a:buffer))
let l:options = ale#fixers#astyle#Var(a:buffer, 'options')
let l:options = ale#fixers#astyle#Var(a:buffer, 'project_options')
let l:command = ' --stdin='
return {

4
doc/ale-c.txt
View file

@ -70,8 +70,8 @@ g:ale_c_astyle_executable *g:ale_c_astyle_executable*
This variable can be changed to use a different executable for astyle.
g:ale_c_astyle_options *g:ale_c_astyle_options*
*b:ale_c_astyle_options*
g:ale_c_astyle_project_options *g:ale_c_astyle_project_options*
*b:ale_c_astyle_project_options*
Type: |String|
Default: `''`

4
doc/ale-cpp.txt
View file

@ -24,8 +24,8 @@ g:ale_cpp_astyle_executable *g:ale_cpp_astyle_executable*
This variable can be changed to use a different executable for astyle.
g:ale_cpp_astyle_options *g:ale_cpp_astyle_options*
*b:ale_cpp_astyle_options*
g:ale_cpp_astyle_project_options *g:ale_cpp_astyle_project_options*
*b:ale_cpp_astyle_project_options*
Type: |String|
Default: `''`

10
test/fixers/test_astyle_fixer_callback.vader
View file

@ -1,6 +1,6 @@
Before:
Save g:ale_c_astyle_executable
Save g:ale_c_astyle_options
Save g:ale_c_astyle_project_options
" Use an invalid global executable, so we don't match it.
let g:ale_c_astyle_executable = 'xxxinvalid'
@ -38,14 +38,14 @@ Execute(The astyle callback should support cpp files):
Execute(The astyle callback should support cpp files with option file set):
call ale#test#SetFilename('../cpp_files/dummy.cpp')
let g:ale_cpp_astyle_options = '.astylerc_cpp'
let g:ale_cpp_astyle_project_options = '.astylerc_cpp'
let targetfile = '/testplugin/test/cpp_files/dummy.cpp'
set filetype=cpp " The test fails without this
AssertEqual
\ {
\ 'command': ale#Escape('invalidpp')
\ . ' --project=' . g:ale_cpp_astyle_options
\ . ' --project=' . g:ale_cpp_astyle_project_options
\ . ' --stdin='
\ },
\ ale#fixers#astyle#Fix(bufnr(''))
@ -54,12 +54,12 @@ Execute(The astyle callback should support cpp files with option file set):
Execute(The astyle callback should return the correct default values with an option file set):
call ale#test#SetFilename('../c_files/testfile.c')
let targetfile = '/testplugin/test/c_files/testfile.c'
let g:ale_c_astyle_options = '.astylerc'
let g:ale_c_astyle_project_options = '.astylerc'
AssertEqual
\ {
\ 'command': ale#Escape('xxxinvalid')
\ . ' --project=' . g:ale_c_astyle_options
\ . ' --project=' . g:ale_c_astyle_project_options
\ . ' --stdin='
\ },
\ ale#fixers#astyle#Fix(bufnr(''))