summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw0rp <w0rp@users.noreply.github.com>2018-05-03 22:20:39 +0100
committerGitHub <noreply@github.com>2018-05-03 22:20:39 +0100
commit726a768464d3e42869088599cf1bd049f7a751df (patch)
tree42d558ccd62eacff6736fccf37524c9bcf27d3fe
parent7c0219efccee6a5929274b07a594e832fd5d596a (diff)
parentf11637b62b6d97be87d241476ebac9962a9a2a51 (diff)
downloadale-726a768464d3e42869088599cf1bd049f7a751df.zip
Merge pull request #1550 from deivid-rodriguez/bundle_option_for_mdl
Add bundle option to mdl
-rw-r--r--ale_linters/markdown/mdl.vim6
-rw-r--r--doc/ale-markdown.txt3
-rw-r--r--test/command_callback/test_markdown_mdl_command_callback.vader7
3 files changed, 14 insertions, 2 deletions
diff --git a/ale_linters/markdown/mdl.vim b/ale_linters/markdown/mdl.vim
index 16b08cc5..0953144b 100644
--- a/ale_linters/markdown/mdl.vim
+++ b/ale_linters/markdown/mdl.vim
@@ -10,9 +10,13 @@ endfunction
function! ale_linters#markdown#mdl#GetCommand(buffer) abort
let l:executable = ale_linters#markdown#mdl#GetExecutable(a:buffer)
+ let l:exec_args = l:executable =~? 'bundle$'
+ \ ? ' exec mdl'
+ \ : ''
+
let l:options = ale#Var(a:buffer, 'markdown_mdl_options')
- return ale#Escape(l:executable)
+ return ale#Escape(l:executable) . l:exec_args
\ . (!empty(l:options) ? ' ' . l:options : '')
endfunction
diff --git a/doc/ale-markdown.txt b/doc/ale-markdown.txt
index d7e50093..63ddcae4 100644
--- a/doc/ale-markdown.txt
+++ b/doc/ale-markdown.txt
@@ -10,7 +10,8 @@ g:ale_markdown_mdl_executable *g:ale_markdown_mdl_executable*
Type: |String|
Default: `'mdl'`
- See |ale-integrations-local-executables|
+ Override the invoked mdl binary. This is useful for running mdl from
+ binstubs or a bundle.
g:ale_markdown_mdl_options *g:ale_markdown_mdl_options*
diff --git a/test/command_callback/test_markdown_mdl_command_callback.vader b/test/command_callback/test_markdown_mdl_command_callback.vader
index 3a68a4b2..2fb9a206 100644
--- a/test/command_callback/test_markdown_mdl_command_callback.vader
+++ b/test/command_callback/test_markdown_mdl_command_callback.vader
@@ -26,3 +26,10 @@ Execute(The executable and options should be configurable):
AssertEqual
\ ale_linters#markdown#mdl#GetCommand(bufnr('')),
\ ale#Escape('foo bar') . ' --wat'
+
+Execute(Setting bundle appends 'exec mdl'):
+ let g:ale_markdown_mdl_executable = 'path to/bundle'
+
+ AssertEqual
+ \ ale#Escape('path to/bundle') . ' exec mdl',
+ \ ale_linters#markdown#mdl#GetCommand(bufnr(''))