Merge branch 'master' into sridhars

1 files changed, 9 insertions, 17 deletions

diff --git a/ale_linters/nasm/nasm.vim b/ale_linters/nasm/nasm.vim
index 77d57e18..cb2119a6 100644
--- a/ale_linters/nasm/nasm.vim
+++ b/ale_linters/nasm/nasm.vim
@@ -4,32 +4,23 @@
 call ale#Set('nasm_nasm_executable', 'nasm')
 call ale#Set('nasm_nasm_options', '')
 
-function! ale_linters#nasm#nasm#GetExecutable(buffer) abort
-    return ale#Var(a:buffer, 'nasm_nasm_executable')
-endfunction
-
-function! ale_linters#nasm#nasm#GetOptions(buffer) abort
-    return ale#Var(a:buffer, 'nasm_nasm_options')
-endfunction
-
 function! ale_linters#nasm#nasm#GetCommand(buffer) abort
-    " Note that NASM require a trailing slash to the -I option.
-    let l:executable = ale#Escape(ale_linters#nasm#nasm#GetExecutable(a:buffer))
+    " Note that NASM requires a trailing slash for the -I option.
     let l:separator = has('win32') ? '\' : '/'
-    let l:path = ale#Escape(fnamemodify(bufname(a:buffer), ':p:h') . l:separator)
-    let l:options = ale_linters#nasm#nasm#GetOptions(a:buffer)
+    let l:path = fnamemodify(bufname(a:buffer), ':p:h') . l:separator
+    let l:output_null = has('win32') ? 'NUL' : '/dev/null'
 
-    return l:executable
-    \   . ' -X gnu'
-    \   . ' -I ' . l:path
-    \   . ' ' . l:options
+    return '%e -X gnu -I ' . ale#Escape(l:path)
+    \   . ale#Pad(ale#Var(a:buffer, 'nasm_nasm_options'))
     \   . ' %s'
+    \   . ' -o ' . l:output_null
 endfunction
 
 function! ale_linters#nasm#nasm#Handle(buffer, lines) abort
     " Note that we treat 'fatal' as errors.
     let l:pattern = '^.\+:\(\d\+\): \([^:]\+\): \(.\+\)$'
     let l:output = []
+
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
         call add(l:output, {
         \ 'lnum': l:match[1] + 0,
@@ -37,6 +28,7 @@ function! ale_linters#nasm#nasm#Handle(buffer, lines) abort
         \ 'text': l:match[3],
         \})
     endfor
+
     return l:output
 endfunction
 
@@ -44,7 +36,7 @@ call ale#linter#Define('nasm', {
 \   'name': 'nasm',
 \   'output_stream': 'stderr',
 \   'lint_file': 1,
-\   'executable_callback': 'ale_linters#nasm#nasm#GetExecutable',
+\   'executable_callback': ale#VarFunc('nasm_nasm_executable'),
 \   'command_callback': 'ale_linters#nasm#nasm#GetCommand',
 \   'callback': 'ale_linters#nasm#nasm#Handle',
 \})