From 6ebd8f355c974cb6b7c5d5aff20603c8c4b38feb Mon Sep 17 00:00:00 2001 From: Markus Doits Date: Sat, 2 Sep 2017 16:48:00 +0200 Subject: slimlint: Search for .rubocop.yml and use it This fixes slim-lint not honoring a `.rubocop.yml` in the file's or parent directory. Due to the way slim-lint calls rubocop, it requires the special `SLIM_LINT_RUBUCOP_CONF` env var to pick up the `.rubocop.yml` if it is not run on the real file (which is the case here). See https://github.com/sds/slim-lint/blob/master/lib/slim_lint/linter/README.md#rubocop --- ale_linters/slim/slimlint.vim | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'ale_linters') diff --git a/ale_linters/slim/slimlint.vim b/ale_linters/slim/slimlint.vim index 74796b2b..0a98a52d 100644 --- a/ale_linters/slim/slimlint.vim +++ b/ale_linters/slim/slimlint.vim @@ -1,5 +1,25 @@ " Author: Markus Doits - https://github.com/doits -" Description: slim-lint for Slim files, based on hamllint.vim +" Description: slim-lint for Slim files + +function! ale_linters#slim#slimlint#GetCommand(buffer) abort + let l:command = 'slim-lint %t' + + let l:rubocop_config = ale#path#FindNearestFile(a:buffer, '.rubocop.yml') + + " Set SLIM_LINT_RUBUCOP_CONF variable as it is needed for slim-lint to + " pick up the rubocop config. + " + " See https://github.com/sds/slim-lint/blob/master/lib/slim_lint/linter/README.md#rubocop + if !empty(l:rubocop_config) + if ale#Has('win32') + let l:command = 'set SLIM_LINT_RUBUCOP_CONF=' . ale#Escape(l:rubocop_config) . ' && ' . l:command + else + let l:command = 'SLIM_LINT_RUBUCOP_CONF=' . ale#Escape(l:rubocop_config) . ' ' . l:command + endif + endif + + return l:command +endfunction function! ale_linters#slim#slimlint#Handle(buffer, lines) abort " Matches patterns like the following: @@ -21,6 +41,6 @@ endfunction call ale#linter#Define('slim', { \ 'name': 'slimlint', \ 'executable': 'slim-lint', -\ 'command': 'slim-lint %t', +\ 'command_callback': 'ale_linters#slim#slimlint#GetCommand', \ 'callback': 'ale_linters#slim#slimlint#Handle' \}) -- cgit v1.2.3