summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--autoload/ale/fixers/jq.vim5
-rw-r--r--doc/ale-json.txt10
-rw-r--r--test/fixers/test_jq_fixer_callback.vader14
3 files changed, 16 insertions, 13 deletions
diff --git a/autoload/ale/fixers/jq.vim b/autoload/ale/fixers/jq.vim
index 4604b24f..b0a43fe2 100644
--- a/autoload/ale/fixers/jq.vim
+++ b/autoload/ale/fixers/jq.vim
@@ -1,11 +1,8 @@
call ale#Set('json_jq_executable', 'jq')
-call ale#Set('json_jq_use_global', 0)
call ale#Set('json_jq_options', '')
function! ale#fixers#jq#GetExecutable(buffer) abort
- return ale#node#FindExecutable(a:buffer, 'jq', [
- \ 'jq',
- \])
+ return ale#Var(a:buffer, 'json_jq_executable')
endfunction
function! ale#fixers#jq#Fix(buffer) abort
diff --git a/doc/ale-json.txt b/doc/ale-json.txt
index 63778331..1e97abce 100644
--- a/doc/ale-json.txt
+++ b/doc/ale-json.txt
@@ -63,15 +63,7 @@ g:ale_json_jq_executable *g:ale_json_jq_executable*
Type: |String|
Default: `'jq'`
- See |ale-integrations-local-executables|
-
-
-g:ale_json_jq_use_global *g:ale_json_jq_use_global*
- *b:ale_json_jq_use_global*
- Type: |Number|
- Default: `0`
-
- See |ale-integrations-local-executables|
+ This option can be changed to change the path for `jq`.
g:ale_json_jq_options *g:ale_json_jq_options*
diff --git a/test/fixers/test_jq_fixer_callback.vader b/test/fixers/test_jq_fixer_callback.vader
new file mode 100644
index 00000000..2e32bf8e
--- /dev/null
+++ b/test/fixers/test_jq_fixer_callback.vader
@@ -0,0 +1,14 @@
+Before:
+ Save g:ale_json_jq_executable
+ Save g:ale_json_jq_options
+
+After:
+ Restore
+
+Execute(The jq fixer should use the options you set):
+ let g:ale_json_jq_executable = 'foo'
+ let g:ale_json_jq_options = '--bar'
+
+ AssertEqual
+ \ {'command': ale#Escape('foo') . ' . --bar'},
+ \ ale#fixers#jq#Fix(bufnr(''))