diff --git a/autoload/ale/lsp_linter.vim b/autoload/ale/lsp_linter.vim index 4527c74e..31299fc5 100644 --- a/autoload/ale/lsp_linter.vim +++ b/autoload/ale/lsp_linter.vim @@ -147,16 +147,14 @@ function! ale#lsp_linter#StartLSP(buffer, linter, callback) abort else let l:executable = ale#linter#GetExecutable(a:buffer, a:linter) - if !executable(l:executable) + if empty(l:executable) || !executable(l:executable) return {} endif + let l:command = ale#linter#GetCommand(a:buffer, a:linter) " Format the command, so %e can be formatted into it. let l:command = ale#command#FormatCommand(a:buffer, l:executable, l:command, 0)[1] - let l:command = ale#job#PrepareCommand( - \ a:buffer, - \ ale#linter#GetCommand(a:buffer, a:linter), - \) + let l:command = ale#job#PrepareCommand(a:buffer, l:command) let l:conn_id = ale#lsp#StartProgram( \ l:executable, \ l:command, diff --git a/test/lsp/test_lsp_command_formatting.vader b/test/lsp/test_lsp_command_formatting.vader new file mode 100644 index 00000000..35c79096 --- /dev/null +++ b/test/lsp/test_lsp_command_formatting.vader @@ -0,0 +1,37 @@ +Before: + runtime autoload/ale/lsp.vim + + let g:args = [] + + " Mock the StartProgram function so we can just capture the arguments. + function! ale#lsp#StartProgram(...) abort + let g:args = a:000 + endfunction + +After: + unlet! g:args + + runtime autoload/ale/lsp.vim + +Execute(Command formatting should be applied correctly for LSP linters): + call ale#lsp_linter#StartLSP( + \ bufnr(''), + \ { + \ 'language_callback': {-> 'x'}, + \ 'project_root_callback': {-> '/foo/bar'}, + \ 'lsp': 'stdio', + \ 'executable': has('win32') ? 'cmd': 'true', + \ 'command': '%e --foo', + \ }, + \ {->0} + \) + + if has('win32') + AssertEqual + \ ['true', 'cmd /s/c cmd --foo', '/foo/bar'], + \ g:args[:2] + else + AssertEqual + \ ['true', ['/bin/bash', '-c', '''true'' --foo'], '/foo/bar'], + \ g:args[:2] + endif