hasufell/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the need for pointless callbacks for LSP linters

Browse Source
This commit is contained in:
w0rp 2017-07-02 13:25:36 +01:00
parent 857ca941d2
commit 51f256e897
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ale_linters/typescript/tsserver.vim
View File

@ -11,14 +11,9 @@ function! ale_linters#typescript#tsserver#GetExecutable(buffer) abort
\]) \])
endfunction endfunction
function! ale_linters#typescript#tsserver#Handle(buffer, lines) abort
return a:lines
endfunction
call ale#linter#Define('typescript', { call ale#linter#Define('typescript', {
\ 'name': 'tsserver', \ 'name': 'tsserver',
\ 'lsp': 'tsserver', \ 'lsp': 'tsserver',
\ 'executable_callback': 'ale_linters#typescript#tsserver#GetExecutable', \ 'executable_callback': 'ale_linters#typescript#tsserver#GetExecutable',
\ 'command_callback': 'ale_linters#typescript#tsserver#GetExecutable', \ 'command_callback': 'ale_linters#typescript#tsserver#GetExecutable',
\ 'callback': 'ale_linters#typescript#tsserver#Handle',
\}) \})

13
autoload/ale/linter.vim
View File

@ -52,21 +52,24 @@ function! ale#linter#PreProcess(linter) abort
let l:obj = { let l:obj = {
\ 'name': get(a:linter, 'name'), \ 'name': get(a:linter, 'name'),
\ 'lsp': get(a:linter, 'lsp', ''), \ 'lsp': get(a:linter, 'lsp', ''),
\ 'callback': get(a:linter, 'callback'),
\} \}
if type(l:obj.name) != type('') if type(l:obj.name) != type('')
throw '`name` must be defined to name the linter' throw '`name` must be defined to name the linter'
endif endif
if !s:IsCallback(l:obj.callback)
throw '`callback` must be defined with a callback to accept output'
endif
let l:needs_address = l:obj.lsp ==# 'socket' let l:needs_address = l:obj.lsp ==# 'socket'
let l:needs_executable = l:obj.lsp !=# 'socket' let l:needs_executable = l:obj.lsp !=# 'socket'
let l:needs_command = l:obj.lsp !=# 'socket' let l:needs_command = l:obj.lsp !=# 'socket'
if empty(l:obj.lsp)
let l:obj.callback = get(a:linter, 'callback')
if !s:IsCallback(l:obj.callback)
throw '`callback` must be defined with a callback to accept output'
endif
endif
if index(['', 'socket', 'stdio', 'tsserver'], l:obj.lsp) < 0 if index(['', 'socket', 'stdio', 'tsserver'], l:obj.lsp) < 0
throw '`lsp` must be either `''lsp''` or `''tsserver''` if defined' throw '`lsp` must be either `''lsp''` or `''tsserver''` if defined'
endif endif

4
test/test_linter_defintion_processing.vader
View File

@ -372,7 +372,6 @@ Execute(PreProcess should accept tsserver LSP configuration):
\ 'executable': 'x', \ 'executable': 'x',
\ 'command': 'x', \ 'command': 'x',
\ 'lsp': 'tsserver', \ 'lsp': 'tsserver',
\ 'callback': 'x',
\} \}
AssertEqual 'tsserver', ale#linter#PreProcess(g:linter).lsp AssertEqual 'tsserver', ale#linter#PreProcess(g:linter).lsp
@ -393,7 +392,6 @@ Execute(PreProcess should accept stdio LSP configuration):
\ 'executable': 'x', \ 'executable': 'x',
\ 'command': 'x', \ 'command': 'x',
\ 'lsp': 'stdio', \ 'lsp': 'stdio',
\ 'callback': 'x',
\} \}
AssertEqual 'stdio', ale#linter#PreProcess(g:linter).lsp AssertEqual 'stdio', ale#linter#PreProcess(g:linter).lsp
@ -412,7 +410,6 @@ Execute(PreProcess should accept LSP server configurations):
let g:linter = { let g:linter = {
\ 'name': 'x', \ 'name': 'x',
\ 'lsp': 'socket', \ 'lsp': 'socket',
\ 'callback': 'x',
\ 'address_callback': 'X', \ 'address_callback': 'X',
\} \}
@ -422,7 +419,6 @@ Execute(PreProcess should require an address_callback for LSP socket configurati
let g:linter = { let g:linter = {
\ 'name': 'x', \ 'name': 'x',
\ 'lsp': 'socket', \ 'lsp': 'socket',
\ 'callback': 'x',
\} \}
AssertThrows call ale#linter#PreProcess(g:linter) AssertThrows call ale#linter#PreProcess(g:linter)