diff options
| author | w0rp <w0rp@users.noreply.github.com> | 2018-06-02 12:36:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-02 12:36:24 +0100 |
| commit | 786fc0a62f2d45b88967aad6d59bb9c483a576ae (patch) | |
| tree | c873fc14a6cc73e340ba5bdee0e685184e571501 | |
| parent | 014d27c882b10c6c6ba1b32ec0ad1ce993b108eb (diff) | |
| parent | 3a1d21e5dd4ec3134dbed68e02e2d8ed4d7ac168 (diff) | |
| download | ale-786fc0a62f2d45b88967aad6d59bb9c483a576ae.zip | |
Merge pull request #1617 from luitzifa/master
Fix for puppet version >= 5.4.0
| -rw-r--r-- | ale_linters/puppet/puppet.vim | 7 | ||||
| -rw-r--r-- | test/handler/test_puppet_handler.vader | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ale_linters/puppet/puppet.vim b/ale_linters/puppet/puppet.vim index 8beeb61e..4ca0dd55 100644 --- a/ale_linters/puppet/puppet.vim +++ b/ale_linters/puppet/puppet.vim @@ -4,14 +4,15 @@ 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" + " Error: Could not parse for environment production: Syntax error at 'parameter1' (file: /tmp/modules/mariadb/manifests/slave.pp, line: 4, column: 5) - let l:pattern = '^Error: .*: \(.\+\) at .\+\.pp:\(\d\+\):\=\(\d*\)' + let l:pattern = '^Error: .*: \(.\+\) \((file:\|at\) .\+\.pp\(, line: \|:\)\(\d\+\)\(, column: \|:\)\=\(\d*\)' let l:output = [] for l:match in ale#util#GetMatches(a:lines, l:pattern) call add(l:output, { - \ 'lnum': l:match[2] + 0, - \ 'col': l:match[3] + 0, + \ 'lnum': l:match[4] + 0, + \ 'col': l:match[6] + 0, \ 'text': l:match[1], \}) endfor diff --git a/test/handler/test_puppet_handler.vader b/test/handler/test_puppet_handler.vader index 0d274fd2..e73c9dc7 100644 --- a/test/handler/test_puppet_handler.vader +++ b/test/handler/test_puppet_handler.vader @@ -37,9 +37,15 @@ Execute(The puppet handler should parse lines and column correctly): \ 'lnum': 54, \ 'col': 9, \ 'text': "Syntax error at ':'" - \ } + \ }, + \ { + \ 'lnum': 45, + \ 'col': 12, + \ 'text': "Syntax error at 'parameter1'" + \ }, \ ], \ 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", + \ "Error: Could not parse for environment production: Syntax error at 'parameter1' (file: /tmp/modules/mariadb/manifests/slave.pp, line: 45, column: 12)", \ ]) |