Merge pull request #1900 from McSwaggens/master

Fixed NASM linter from outputting junk file

ale_linters/dart/language_server.vim

@@ -15,6 +15,6 @@ call ale#linter#Define('dart', {
 \   'name': 'language_server',
 \   'lsp': 'stdio',
 \   'executable_callback': ale#VarFunc('dart_language_server_executable'),
-\   'command_callback': 'ale_linters#dart#language_server#GetExecutable',
+\   'command': '%e',
 \   'project_root_callback': 'ale_linters#dart#language_server#GetProjectRoot',
 \})

ale_linters/kotlin/languageserver.vim

@@ -23,7 +23,7 @@ call ale#linter#Define('kotlin', {
 \   'name': 'languageserver',
 \   'lsp': 'stdio',
 \   'executable_callback': ale#VarFunc('kotlin_languageserver_executable'),
-\   'command_callback': '%e',
+\   'command': '%e',
 \   'language': 'kotlin',
 \   'project_root_callback': 'ale_linters#kotlin#languageserver#GetProjectRoot',
 \})

ale_linters/nasm/nasm.vim

@@ -8,10 +8,12 @@ function! ale_linters#nasm#nasm#GetCommand(buffer) abort
     " Note that NASM requires a trailing slash for the -I option.
     let l:separator = has('win32') ? '\' : '/'
     let l:path = fnamemodify(bufname(a:buffer), ':p:h') . l:separator
+    let l:output_null = has('win32') ? 'NUL' : '/dev/null'
 
     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

ale_linters/perl/perl.vim

@@ -14,6 +14,10 @@ let s:begin_failed_skip_pattern = '\v' . join([
 \], '|')
 
 function! ale_linters#perl#perl#Handle(buffer, lines) abort
+    if empty(a:lines)
+        return []
+    endif
+
     let l:pattern = '\(.\+\) at \(.\+\) line \(\d\+\)'
     let l:output = []
     let l:basename = expand('#' . a:buffer . ':t')

autoload/ale/definition.vim

@@ -49,7 +49,7 @@ function! ale#definition#HandleLSPResponse(conn_id, response) abort
         for l:item in l:result
             let l:filename = ale#path#FromURI(l:item.uri)
             let l:line = l:item.range.start.line + 1
-            let l:column = l:item.range.start.character
+            let l:column = l:item.range.start.character + 1
 
             call ale#util#Open(l:filename, l:line, l:column, l:options)
             break

autoload/ale/fix/registry.vim

@@ -243,7 +243,7 @@ endfunction
 " (name, func, filetypes, desc, aliases)
 function! ale#fix#registry#Add(name, func, filetypes, desc, ...) abort
     " This command will throw from the sandbox.
-    let &equalprg=&equalprg
+    let &l:equalprg=&l:equalprg
 
     if type(a:name) isnot v:t_string
         throw '''name'' must be a String'

autoload/ale/fixers/importjs.vim

@@ -1,7 +1,7 @@
 " Author: Jeff Willette <jrwillette88@gmail.com>
 " Description: Integration of importjs with ALE.
 
-call ale#Set('js_importjs_executable', 'importjs')
+call ale#Set('javascript_importjs_executable', 'importjs')
 
 function! ale#fixers#importjs#ProcessOutput(buffer, output) abort
     let l:result = ale#util#FuzzyJSONDecode(a:output, [])
@@ -9,7 +9,7 @@ function! ale#fixers#importjs#ProcessOutput(buffer, output) abort
 endfunction
 
 function! ale#fixers#importjs#Fix(buffer) abort
-    let l:executable = ale#Var(a:buffer, 'js_importjs_executable')
+    let l:executable = ale#Var(a:buffer, 'javascript_importjs_executable')
 
     if !executable(l:executable)
         return 0

autoload/ale/linter.vim

@@ -53,7 +53,7 @@ endfunction
 " Do not call this function.
 function! ale#linter#GetLintersLoaded() abort
     " This command will throw from the sandbox.
-    let &equalprg=&equalprg
+    let &l:equalprg=&l:equalprg
 
     return s:linters
 endfunction
@@ -295,7 +295,7 @@ endfunction
 
 function! ale#linter#Define(filetype, linter) abort
     " This command will throw from the sandbox.
-    let &equalprg=&equalprg
+    let &l:equalprg=&l:equalprg
 
     if !has_key(s:linters, a:filetype)
         let s:linters[a:filetype] = []

autoload/ale/lsp.vim

@@ -256,7 +256,8 @@ function! ale#lsp#HandleOtherInitializeResponses(conn, response) abort
     endif
 
     if get(a:response, 'method', '') is# ''
-        if has_key(get(a:response, 'result', {}), 'capabilities')
+        if type(get(a:response, 'result')) is v:t_dict
+        \&& has_key(a:response.result, 'capabilities')
             call s:UpdateCapabilities(a:conn, a:response.result.capabilities)
 
             for [l:dir, l:project] in l:uninitialized_projects

autoload/ale/util.vim

@@ -268,7 +268,7 @@ endfunction
 " See :help sandbox
 function! ale#util#InSandbox() abort
     try
-        let &equalprg=&equalprg
+        let &l:equalprg=&l:equalprg
     catch /E48/
         " E48 is the sandbox error.
         return 1

test/command_callback/test_dart_language_server_command_callback.vader

@@ -0,0 +1,8 @@
+Before:
+  call ale#assert#SetUpLinterTest('dart', 'language_server')
+
+After:
+  call ale#assert#TearDownLinterTest()
+
+Execute(The default command should be correct):
+  AssertLinter 'dart_language_server', ale#Escape('dart_language_server')

test/command_callback/test_kotlin_languageserver_command_callback.vader

@@ -0,0 +1,8 @@
+Before:
+  call ale#assert#SetUpLinterTest('kotlin', 'languageserver')
+
+After:
+  call ale#assert#TearDownLinterTest()
+
+Execute(The default command should be correct):
+  AssertLinter 'kotlin-language-server', ale#Escape('kotlin-language-server')

test/command_callback/test_nasm_nasm_command_callbacks.vader

@@ -2,9 +2,9 @@ Before:
   call ale#assert#SetUpLinterTest('nasm', 'nasm')
 
   let b:command_tail =
-  \ ' -X gnu -I ' . ale#Escape(getcwd() . (has('win32') ? '\' : '/')) . ' %s'
+  \ ' -X gnu -I ' . ale#Escape(getcwd() . (has('win32') ? '\' : '/')) . ' %s -o ' . (has('win32') ? 'NUL' : '/dev/null')
   let b:command_tail_opt =
-  \ ' -X gnu -I ' . ale#Escape(getcwd() . (has('win32') ? '\' : '/')) . ' -w+orphan-labels %s'
+  \ ' -X gnu -I ' . ale#Escape(getcwd() . (has('win32') ? '\' : '/')) . ' -w+orphan-labels %s -o ' . (has('win32') ? 'NUL' : '/dev/null')
 
 After:
   unlet! b:command_tail
@@ -23,7 +23,7 @@ Execute(The options should be configurable):
   let b:ale_nasm_nasm_options = '-w-macro-params'
 
   AssertLinter 'nasm', ale#Escape('nasm')
-  \ . ' -X gnu -I ' . ale#Escape(getcwd() . (has('win32') ? '\' : '/')) . ' -w-macro-params %s'
+  \ . ' -X gnu -I ' . ale#Escape(getcwd() . (has('win32') ? '\' : '/')) . ' -w-macro-params %s -o ' . (has('win32') ? 'NUL' : '/dev/null')
 
 Execute(The options should be used in command):
   let b:ale_nasm_nasm_options = '-w+orphan-labels'

test/fixers/test_importjs_fixer_callback.vader

@@ -1,8 +1,8 @@
 Before:
-  Save g:ale_js_importjs_executable
+  Save g:ale_javascript_importjs_executable
 
   " Use an invalid global executable, so we don't match it.
-  let g:ale_js_importjs_executable = 'xxxinvalid'
+  let g:ale_javascript_importjs_executable = 'xxxinvalid'
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
   call ale#test#SetFilename('../javascript_files/test.js')
@@ -18,12 +18,12 @@ Execute(The importjs callback should return 0 when the executable isn't executab
   \ ale#fixers#importjs#Fix(bufnr(''))
 
 Execute(The importjs callback should run the command when the executable test passes):
-  let g:ale_js_importjs_executable = has('win32') ? 'cmd' : 'echo'
+  let g:ale_javascript_importjs_executable = has('win32') ? 'cmd' : 'echo'
 
   AssertEqual
   \ {
   \   'process_with': 'ale#fixers#importjs#ProcessOutput',
-  \   'command': ale#Escape(g:ale_js_importjs_executable) . ' fix %s'
+  \   'command': ale#Escape(g:ale_javascript_importjs_executable) . ' fix %s'
   \ },
   \ ale#fixers#importjs#Fix(bufnr(''))
 

test/handler/test_perl_handler.vader

@@ -7,6 +7,11 @@ After:
   call ale#test#RestoreDirectory()
   call ale#linter#Reset()
 
+Execute(The Perl linter should handle empty output):
+  call ale#test#SetFilename('bar.pl')
+
+  AssertEqual [], ale_linters#perl#perl#Handle(bufnr(''), [])
+
 Execute(The Perl linter should ignore errors from other files):
   call ale#test#SetFilename('bar.pl')
 

test/lsp/test_other_initialize_message_handling.vader

@@ -181,3 +181,10 @@ Execute(Disabled capabilities should be recognised correctly):
   \   },
   \ },
   \ b:conn
+
+Execute(Results that are not dictionaries should be handled correctly):
+  call ale#lsp#HandleOtherInitializeResponses(b:conn, {
+  \ 'jsonrpc': '2.0',
+  \ 'id': 1,
+  \ 'result': v:null,
+  \})

test/test_go_to_definition.vader

@@ -209,7 +209,7 @@ Execute(Other files should be jumped to for LSP definition responses):
   \   'edit +3 ' . fnameescape(ale#path#Simplify(g:dir . '/completion_dummy_file')),
   \ ],
   \ g:expr_list
-  AssertEqual [3, 7], getpos('.')[1:2]
+  AssertEqual [3, 8], getpos('.')[1:2]
   AssertEqual {}, ale#definition#GetMap()
 
 Execute(Locations inside the same file should be jumped to without using :edit):
@@ -231,7 +231,7 @@ Execute(Locations inside the same file should be jumped to without using :edit):
   \ [
   \ ],
   \ g:expr_list
-  AssertEqual [3, 7], getpos('.')[1:2]
+  AssertEqual [3, 8], getpos('.')[1:2]
   AssertEqual {}, ale#definition#GetMap()
 
 Execute(Other files should be jumped to in tabs for LSP definition responses):
@@ -254,7 +254,7 @@ Execute(Other files should be jumped to in tabs for LSP definition responses):
   \   'tabedit +3 ' . fnameescape(ale#path#Simplify(g:dir . '/completion_dummy_file')),
   \ ],
   \ g:expr_list
-  AssertEqual [3, 7], getpos('.')[1:2]
+  AssertEqual [3, 8], getpos('.')[1:2]
   AssertEqual {}, ale#definition#GetMap()
 
 Execute(Definition responses with lists should be handled):
@@ -285,7 +285,7 @@ Execute(Definition responses with lists should be handled):
   \   'edit +3 ' . fnameescape(ale#path#Simplify(g:dir . '/completion_dummy_file')),
   \ ],
   \ g:expr_list
-  AssertEqual [3, 7], getpos('.')[1:2]
+  AssertEqual [3, 8], getpos('.')[1:2]
   AssertEqual {}, ale#definition#GetMap()
 
 Execute(Definition responses with null response should be handled):