jshaver
/
ale
forked from github-mirrors/ale
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add the buffer-local options 'b:ale_shell' and 'b:ale_shell_arguments'. (#4146)

This commit is contained in:
James Cherti 2022-04-06 01:32:11 -04:00 committed by GitHub
parent c984daa0ec
commit 6c1f616c59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autoload/ale/job.vim
View File

@ -187,10 +187,16 @@ function! ale#job#PrepareCommand(buffer, command) abort
\ : a:command
" If a custom shell is specified, use that.
if exists('g:ale_shell')
let l:shell_arguments = get(g:, 'ale_shell_arguments', &shellcmdflag)
if exists('b:ale_shell')
let l:ale_shell = b:ale_shell
elseif exists('g:ale_shell')
let l:ale_shell = g:ale_shell
endif
return split(g:ale_shell) + split(l:shell_arguments) + [l:command]
if exists('l:ale_shell')
let l:shell_arguments = get(b:, 'ale_shell_arguments', get(g:, 'ale_shell_arguments', &shellcmdflag))
return split(l:ale_shell) + split(l:shell_arguments) + [l:command]
endif
if has('win32')

2
doc/ale.txt
View File

@ -2093,6 +2093,7 @@ g:ale_sign_priority *g:ale_sign_priority*
g:ale_shell *g:ale_shell*
*b:ale_shell*
Type: |String|
Default: not set
@ -2110,6 +2111,7 @@ g:ale_shell *g:ale_shell*
g:ale_shell_arguments *g:ale_shell_arguments*
*b:ale_shell_arguments*
Type: |String|
Default: not set

23
test/test_prepare_command.vader
View File

@ -4,6 +4,12 @@ Before:
Save g:ale_shell
Save g:ale_shell_arguments
Save b:ale_shell
Save b:ale_shell_arguments
unlet! b:ale_shell
unlet! b:ale_shell_arguments
unlet! g:ale_shell
unlet! g:ale_shell_arguments
@ -61,7 +67,7 @@ Execute(cmd /s/c as a string should be used on Windows):
AssertEqual 'cmd /s/c "foobar"', ale#job#PrepareCommand(bufnr(''), 'foobar')
endif
Execute(Setting ale_shell should cause ale#job#PrepareCommand to use set shell):
Execute(Setting g:ale_shell should cause ale#job#PrepareCommand to use set shell):
let g:ale_shell = '/foo/bar'
if has('win32')
@ -73,3 +79,18 @@ Execute(Setting ale_shell should cause ale#job#PrepareCommand to use set shell):
let g:ale_shell_arguments = '-x'
AssertEqual ['/foo/bar', '-x', 'foobar'], ale#job#PrepareCommand(bufnr(''), "foobar")
Execute(Setting b:ale_shell should cause ale#job#PrepareCommand to use set shell):
let g:ale_shell = '/wrong/foo/bar'
let b:ale_shell = '/foo/bar'
if has('win32')
AssertEqual ['/foo/bar', '/c', 'foobar'], ale#job#PrepareCommand(bufnr(''), "foobar")
else
AssertEqual ['/foo/bar', '-c', 'foobar'], ale#job#PrepareCommand(bufnr(''), "foobar")
endif
let g:ale_shell_arguments = '--verbose -x'
let b:ale_shell_arguments = '-x'
AssertEqual ['/foo/bar', '-x', 'foobar'], ale#job#PrepareCommand(bufnr(''), "foobar")