Merge pull request #2924 from patrick96/vlog-filename

verilog: Add filename to vlog linter output

1 files changed, 8 insertions, 6 deletions

diff --git a/ale_linters/verilog/vlog.vim b/ale_linters/verilog/vlog.vim
index 951e2037..45e1977c 100644
--- a/ale_linters/verilog/vlog.vim
+++ b/ale_linters/verilog/vlog.vim
@@ -13,14 +13,15 @@ function! ale_linters#verilog#vlog#Handle(buffer, lines) abort
     "Matches patterns like the following:
     "** Warning: add.v(7): (vlog-2623) Undefined variable: C.
     "** Error: file.v(1): (vlog-13294) Identifier must be declared with a port mode: C.
-    let l:pattern = '^**\s\(\w*\):[a-zA-Z0-9\-\.\_\/ ]\+(\(\d\+\)):\s\+\(.*\)'
+    let l:pattern = '^**\s\(\w*\): \([a-zA-Z0-9\-\.\_\/ ]\+\)(\(\d\+\)):\s\+\(.*\)'
     let l:output = []
 
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
         call add(l:output, {
-        \   'lnum': l:match[2] + 0,
+        \   'lnum': l:match[3] + 0,
         \   'type': l:match[1] is? 'Error' ? 'E' : 'W',
-        \   'text': l:match[3],
+        \   'text': l:match[4],
+        \   'filename': l:match[2],
         \})
     endfor
 
@@ -28,13 +29,14 @@ function! ale_linters#verilog#vlog#Handle(buffer, lines) abort
     "** Warning: (vlog-2623) add.v(7): Undefined variable: C.
     "** Error: (vlog-13294) file.v(1): Identifier must be declared with a port mode: C.
     " let l:pattern = '^**\s\(\w*\):[a-zA-Z0-9\-\.\_\/ ]\+(\(\d\+\)):\s\+\(.*\)'
-    let l:pattern = '^**\s\(\w*\):\s\([^)]*)\)[a-zA-Z0-9\-\.\_\/ ]\+(\(\d\+\)):\s\+\(.*\)'
+    let l:pattern = '^**\s\(\w*\):\s\([^)]*)\) \([a-zA-Z0-9\-\.\_\/ ]\+\)(\(\d\+\)):\s\+\(.*\)'
 
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
         call add(l:output, {
-        \   'lnum': l:match[3] + 0,
+        \   'lnum': l:match[4] + 0,
         \   'type': l:match[1] is? 'Error' ? 'E' : 'W',
-        \   'text': l:match[2] . ' ' . l:match[4],
+        \   'text': l:match[2] . ' ' . l:match[5],
+        \   'filename': l:match[3],
         \})
     endfor