From 2bd966c5cc33b8b19570a7978845c2786da62363 Mon Sep 17 00:00:00 2001
From: Dave Wongillies <davewongillies@users.noreply.github.com>
Date: Sat, 2 Dec 2017 04:29:17 -0800
Subject: [PATCH] Puppet: allow for when parser doesn't supply column for
 errors (#1182)

* puppet: add test for puppet parser validate

* puppet: handle where parser validate doesn't supply the column

* puppet: add test for when parser validate doesn't supply column

* Fix puppet regex to handle Windows paths
---
 ale_linters/puppet/puppet.vim          |  3 +-
 test/handler/test_puppet_handler.vader | 45 ++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 test/handler/test_puppet_handler.vader

diff --git a/ale_linters/puppet/puppet.vim b/ale_linters/puppet/puppet.vim
index 47e89d3..8beeb61 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 0000000..0d274fd
--- /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",
+  \ ])