summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw0rp <devw0rp@gmail.com>2017-12-13 11:14:31 +0000
committerw0rp <devw0rp@gmail.com>2017-12-13 11:14:31 +0000
commitd2a6d9a9152476ed89fcb10291c95d4fc3716423 (patch)
treef9d4ac17152f78a2ea924f6cb5536a029c2f3b81
parent7a88a3605c9bc270bcbc00fbf11aaf2a825d7bae (diff)
downloadale-d2a6d9a9152476ed89fcb10291c95d4fc3716423.zip
Fix #1216 - Suppress trailing whitespace warings for ansible-lint when the option is set
-rw-r--r--ale_linters/ansible/ansible_lint.vim2
-rw-r--r--test/handler/test_ansible_lint_handler.vader20
2 files changed, 18 insertions, 4 deletions
diff --git a/ale_linters/ansible/ansible_lint.vim b/ale_linters/ansible/ansible_lint.vim
index 27c96320..0b3b39c8 100644
--- a/ale_linters/ansible/ansible_lint.vim
+++ b/ale_linters/ansible/ansible_lint.vim
@@ -21,7 +21,7 @@ function! ale_linters#ansible#ansible_lint#Handle(buffer, lines) abort
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:code = l:match[4]
- if l:code is# 'EANSIBLE002'
+ if l:code is# 'EANSIBLE0002'
\&& !ale#Var(a:buffer, 'warn_about_trailing_whitespace')
" Skip warnings for trailing whitespace if the option is off.
continue
diff --git a/test/handler/test_ansible_lint_handler.vader b/test/handler/test_ansible_lint_handler.vader
index cd6e513e..796277e6 100644
--- a/test/handler/test_ansible_lint_handler.vader
+++ b/test/handler/test_ansible_lint_handler.vader
@@ -1,9 +1,13 @@
Before:
- runtime ale_linters/ansible/ansible_lint.vim
- call ale#test#SetFilename('main.yml')
+ runtime ale_linters/ansible/ansible_lint.vim
+ call ale#test#SetFilename('main.yml')
+
+ let b:ale_warn_about_trailing_whitespace = 1
After:
- call ale#linter#Reset()
+ unlet! b:ale_warn_about_trailing_whitespace
+
+ call ale#linter#Reset()
Execute(The ansible-lint handler should handle basic errors):
AssertEqual
@@ -20,6 +24,16 @@ Execute(The ansible-lint handler should handle basic errors):
\ fnamemodify(tempname(), ':h') . '/main.yml:35: [EANSIBLE0002] Trailing whitespace',
\ ])
+Execute(The ansible-lint handler should supress trailing whitespace output when the option is used):
+ let b:ale_warn_about_trailing_whitespace = 0
+
+ AssertEqual
+ \ [
+ \ ],
+ \ ale_linters#ansible#ansible_lint#Handle(bufnr(''), [
+ \ fnamemodify(tempname(), ':h') . '/main.yml:35: [EANSIBLE0002] Trailing whitespace',
+ \ ])
+
Execute (The ansible-lint handler should handle names with spaces):
AssertEqual
\ [