summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas van der Burgt <thvdburgt@users.noreply.github.com>2017-11-17 11:02:30 +0100
committerw0rp <w0rp@users.noreply.github.com>2017-11-17 10:02:30 +0000
commit22ec81e1de48cf442238dac9f85a579e04bf70cb (patch)
treeac057bb694b5ff5478177ecfbfb666b67d8deed1
parenta139b387c818a5bf05ed38381a99341aa9950aba (diff)
downloadale-22ec81e1de48cf442238dac9f85a579e04bf70cb.zip
add ale_asm_gcc_executable option (#1138)
* add ale_asm_gcc_executable option * add Vader tests for asm gcc linter command callbacks
-rw-r--r--ale_linters/asm/gcc.vim12
-rw-r--r--doc/ale-asm.txt8
-rw-r--r--test/command_callback/test_asm_gcc_command_callbacks.vader39
3 files changed, 56 insertions, 3 deletions
diff --git a/ale_linters/asm/gcc.vim b/ale_linters/asm/gcc.vim
index 39b1f7c2..4ac876f8 100644
--- a/ale_linters/asm/gcc.vim
+++ b/ale_linters/asm/gcc.vim
@@ -1,10 +1,16 @@
" Author: Lucas Kolstad <lkolstad@uw.edu>
" Description: gcc linter for asm files
-let g:ale_asm_gcc_options = get(g:, 'ale_asm_gcc_options', '-Wall')
+call ale#Set('asm_gcc_executable', 'gcc')
+call ale#Set('asm_gcc_options', '-Wall')
+
+function! ale_linters#asm#gcc#GetExecutable(buffer) abort
+ return ale#Var(a:buffer, 'asm_gcc_executable')
+endfunction
function! ale_linters#asm#gcc#GetCommand(buffer) abort
- return 'gcc -x assembler -fsyntax-only '
+ return ale#Escape(ale_linters#asm#gcc#GetExecutable(a:buffer))
+ \ . ' -x assembler -fsyntax-only '
\ . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
\ . ' ' . ale#Var(a:buffer, 'asm_gcc_options') . ' -'
endfunction
@@ -27,7 +33,7 @@ endfunction
call ale#linter#Define('asm', {
\ 'name': 'gcc',
\ 'output_stream': 'stderr',
-\ 'executable': 'gcc',
+\ 'executable_callback': 'ale_linters#asm#gcc#GetExecutable',
\ 'command_callback': 'ale_linters#asm#gcc#GetCommand',
\ 'callback': 'ale_linters#asm#gcc#Handle',
\})
diff --git a/doc/ale-asm.txt b/doc/ale-asm.txt
index 63b5441f..a97c6d00 100644
--- a/doc/ale-asm.txt
+++ b/doc/ale-asm.txt
@@ -5,6 +5,14 @@ ALE ASM Integration *ale-asm-options*
===============================================================================
gcc *ale-asm-gcc*
+g:ale_asm_gcc_executable *g:ale_asm_gcc_executable*
+ *b:ale_asm_gcc_executable*
+ Type: |String|
+ Default: `'gcc'`
+
+This variable can be changed to use a different executable for gcc.
+
+
g:ale_asm_gcc_options *g:ale_asm_gcc_options*
*b:ale_asm_gcc_options*
Type: |String|
diff --git a/test/command_callback/test_asm_gcc_command_callbacks.vader b/test/command_callback/test_asm_gcc_command_callbacks.vader
new file mode 100644
index 00000000..ce8b906a
--- /dev/null
+++ b/test/command_callback/test_asm_gcc_command_callbacks.vader
@@ -0,0 +1,39 @@
+Before:
+ Save g:ale_asm_gcc_executable
+ Save g:ale_asm_gcc_options
+
+ unlet! g:ale_asm_gcc_executable
+ unlet! b:ale_asm_gcc_executable
+ unlet! g:ale_asm_gcc_options
+ unlet! b:ale_asm_gcc_options
+
+ runtime ale_linters/asm/gcc.vim
+
+ let b:command_tail = ' -x assembler -fsyntax-only -iquote'
+ \ . ' ' . ale#Escape(getcwd())
+ \ . ' -Wall -'
+
+After:
+ Restore
+ unlet! b:command_tail
+ unlet! b:ale_asm_gcc_executable
+ unlet! b:ale_asm_gcc_options
+ call ale#linter#Reset()
+
+Execute(The executable should be configurable):
+ AssertEqual 'gcc', ale_linters#asm#gcc#GetExecutable(bufnr(''))
+
+ let b:ale_asm_gcc_executable = 'foobar'
+
+ AssertEqual 'foobar', ale_linters#asm#gcc#GetExecutable(bufnr(''))
+
+Execute(The executable should be used in the command):
+ AssertEqual
+ \ ale#Escape('gcc') . b:command_tail,
+ \ ale_linters#asm#gcc#GetCommand(bufnr(''))
+
+ let b:ale_asm_gcc_executable = 'foobar'
+
+ AssertEqual
+ \ ale#Escape('foobar') . b:command_tail,
+ \ ale_linters#asm#gcc#GetCommand(bufnr(''))