summaryrefslogtreecommitdiff
path: root/ale_linters
diff options
context:
space:
mode:
authorCharles B Johnson <mail@cbjohnson.info>2020-04-08 17:59:17 -0500
committerCharles B Johnson <mail@cbjohnson.info>2021-01-22 09:23:53 -0600
commit6bfcb9cdffb86bf1a3e6d26cd1964858ff4bc3dd (patch)
tree90bc7b90a5a78691b0d79487633af48f5404ea10 /ale_linters
parentdb816b5c3fcf032e8053d23e6d48447eb9b08bb6 (diff)
downloadale-6bfcb9cdffb86bf1a3e6d26cd1964858ff4bc3dd.zip
linters/xo: consolidate xo linters
Diffstat (limited to 'ale_linters')
-rw-r--r--ale_linters/javascript/xo.vim23
-rw-r--r--ale_linters/typescript/xo.vim23
2 files changed, 6 insertions, 40 deletions
diff --git a/ale_linters/javascript/xo.vim b/ale_linters/javascript/xo.vim
index e24f4a82..5b206df8 100644
--- a/ale_linters/javascript/xo.vim
+++ b/ale_linters/javascript/xo.vim
@@ -1,26 +1,9 @@
" Author: Daniel Lupu <lupu.daniel.f@gmail.com>
" Description: xo for JavaScript files
-call ale#Set('javascript_xo_executable', 'xo')
-call ale#Set('javascript_xo_use_global', get(g:, 'ale_use_global_executables', 0))
-call ale#Set('javascript_xo_options', '')
-
-function! ale_linters#javascript#xo#GetExecutable(buffer) abort
- return ale#node#FindExecutable(a:buffer, 'javascript_xo', [
- \ 'node_modules/.bin/xo',
- \])
-endfunction
-
-function! ale_linters#javascript#xo#GetCommand(buffer) abort
- return ale#Escape(ale_linters#javascript#xo#GetExecutable(a:buffer))
- \ . ' ' . ale#Var(a:buffer, 'javascript_xo_options')
- \ . ' --reporter json --stdin --stdin-filename %s'
-endfunction
-
-" xo uses eslint and the output format is the same
call ale#linter#Define('javascript', {
\ 'name': 'xo',
-\ 'executable': function('ale_linters#javascript#xo#GetExecutable'),
-\ 'command': function('ale_linters#javascript#xo#GetCommand'),
-\ 'callback': 'ale#handlers#eslint#HandleJSON',
+\ 'executable': {b -> ale#handlers#xo#GetExecutable(b, 'javascript')},
+\ 'command': {b -> ale#handlers#xo#GetLintCommand(b, 'javascript')},
+\ 'callback': 'ale#handlers#xo#HandleJSON',
\})
diff --git a/ale_linters/typescript/xo.vim b/ale_linters/typescript/xo.vim
index 0a3a717b..13ae0cf7 100644
--- a/ale_linters/typescript/xo.vim
+++ b/ale_linters/typescript/xo.vim
@@ -1,23 +1,6 @@
-call ale#Set('typescript_xo_executable', 'xo')
-call ale#Set('typescript_xo_use_global', get(g:, 'ale_use_global_executables', 0))
-call ale#Set('typescript_xo_options', '')
-
-function! ale_linters#typescript#xo#GetExecutable(buffer) abort
- return ale#node#FindExecutable(a:buffer, 'typescript_xo', [
- \ 'node_modules/.bin/xo',
- \])
-endfunction
-
-function! ale_linters#typescript#xo#GetCommand(buffer) abort
- return ale#Escape(ale_linters#typescript#xo#GetExecutable(a:buffer))
- \ . ale#Pad(ale#Var(a:buffer, 'typescript_xo_options'))
- \ . ' --reporter json --stdin --stdin-filename %s'
-endfunction
-
-" xo uses eslint and the output format is the same
call ale#linter#Define('typescript', {
\ 'name': 'xo',
-\ 'executable': function('ale_linters#typescript#xo#GetExecutable'),
-\ 'command': function('ale_linters#typescript#xo#GetCommand'),
-\ 'callback': 'ale#handlers#eslint#HandleJSON',
+\ 'executable': {b -> ale#handlers#xo#GetExecutable(b, 'typescript')},
+\ 'command': {b -> ale#handlers#xo#GetLintCommand(b, 'typescript')},
+\ 'callback': 'ale#handlers#xo#HandleJSON',
\})