Skip to content

Commit

Permalink
fix: Change _options to _project_options
Browse files Browse the repository at this point in the history
  • Loading branch information
jhlink committed Jul 28, 2020
1 parent 0e6578c commit 5377272
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
5 changes: 3 additions & 2 deletions autoload/ale/fixers/astyle.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions doc/ale-c.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,17 @@ 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: `''`

This variable can be changed to use an option file for project level
configurations. Provide only the filename of the option file that should be
present at the project's root directory.
present at the project's root directory.

For example, if .astylrc is specified, the file is searched in the parent
directories of the source file's directory.
directories of the source file's directory.


===============================================================================
Expand Down
8 changes: 4 additions & 4 deletions doc/ale-cpp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ 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: `''`

This variable can be changed to use an option file for project level
configurations. Provide only the filename of the option file that should be
present at the project's root directory.
present at the project's root directory.

For example, if .astylrc is specified, the file is searched in the parent
directories of the source file's directory.
directories of the source file's directory.


===============================================================================
Expand Down
12 changes: 6 additions & 6 deletions test/fixers/test_astyle_fixer_callback.vader
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
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'
let g:ale_cpp_astyle_executable = 'invalidpp'

call ale#test#SetDirectory('/testplugin/test/fixers')

After:
Expand Down Expand Up @@ -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(''))
Expand All @@ -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(''))

0 comments on commit 5377272

Please sign in to comment.