summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ale_linters/puppet/puppet.vim3
-rw-r--r--test/handler/test_puppet_handler.vader45
2 files changed, 47 insertions, 1 deletions
diff --git a/ale_linters/puppet/puppet.vim b/ale_linters/puppet/puppet.vim
index 47e89d34..8beeb61e 100644
--- a/ale_linters/puppet/puppet.vim
+++ b/ale_linters/puppet/puppet.vim
@@ -3,8 +3,9 @@
function! ale_linters#puppet#puppet#Handle(buffer, lines) abort
" Matches patterns like the following:
" Error: Could not parse for environment production: Syntax error at ':' at /root/puppetcode/modules/nginx/manifests/init.pp:43:12
+ " Error: Could not parse for environment production: Syntax error at '='; expected '}' at /root/puppetcode/modules/pancakes/manifests/init.pp:5"
- let l:pattern = '^Error: .*: \(.\+\) at .\+:\(\d\+\):\(\d\+\)$'
+ let l:pattern = '^Error: .*: \(.\+\) at .\+\.pp:\(\d\+\):\=\(\d*\)'
let l:output = []
for l:match in ale#util#GetMatches(a:lines, l:pattern)
diff --git a/test/handler/test_puppet_handler.vader b/test/handler/test_puppet_handler.vader
new file mode 100644
index 00000000..0d274fd2
--- /dev/null
+++ b/test/handler/test_puppet_handler.vader
@@ -0,0 +1,45 @@
+Before:
+ runtime ale_linters/puppet/puppet.vim
+
+After:
+ call ale#linter#Reset()
+
+Execute(The puppet handler should parse lines correctly when no column is supplied):
+ " Line Error
+ AssertEqual
+ \ [
+ \ {
+ \ 'lnum': 5,
+ \ 'col': 0,
+ \ 'text': "Syntax error at '='; expected '}'"
+ \ },
+ \ {
+ \ 'lnum': 3,
+ \ 'col': 0,
+ \ 'text': "Syntax error at '='; expected '}'"
+ \ },
+ \ ],
+ \ ale_linters#puppet#puppet#Handle(255, [
+ \ "Error: Could not parse for environment production: Syntax error at '='; expected '}' at /root/puppetcode/modules/pancakes/manifests/init.pp:5",
+ \ "Error: Could not parse for environment production: Syntax error at '='; expected '}' at C:/puppet/modules/pancakes/manifests/init.pp:3",
+ \ ])
+
+Execute(The puppet handler should parse lines and column correctly):
+ " Line Error
+ AssertEqual
+ \ [
+ \ {
+ \ 'lnum': 43,
+ \ 'col': 12,
+ \ 'text': "Syntax error at ':'"
+ \ },
+ \ {
+ \ 'lnum': 54,
+ \ 'col': 9,
+ \ 'text': "Syntax error at ':'"
+ \ }
+ \ ],
+ \ ale_linters#puppet#puppet#Handle(255, [
+ \ "Error: Could not parse for environment production: Syntax error at ':' at /root/puppetcode/modules/nginx/manifests/init.pp:43:12",
+ \ "Error: Could not parse for environment production: Syntax error at ':' at C:/puppet/modules/nginx/manifests/init.pp:54:9",
+ \ ])