VimPlug/ale
1
0
Fork 0
mirror of https://github.com/dense-analysis/ale.git synced 2025-12-07 13:14:29 +08:00
Code Issues Actions Packages Projects Releases 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
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 {

8
doc/ale-c.txt
View File

@@ -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.
===============================================================================

8
doc/ale-cpp.txt
View File

@@ -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.
===============================================================================

12
test/fixers/test_astyle_fixer_callback.vader
View File

@@ -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:
@@ -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(''))