From ea72d66b6d4e3f0dc04d12fba08fe29e7e637b72 Mon Sep 17 00:00:00 2001
From: Tarik Graba <tarikgraba@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:35:25 +0100
Subject: Verilator current file search path (#3500)

* Simplify verilator linter using ale command format strings
* Verilator Linter: Restructure linter command tests
* Verilator Linter: adds to the handler test the returned filename
* Verilator Linter: add the current file path to the search path
* Verilator Linter: Add the search path to the tests

Co-authored-by: TG <tarik.graba@telecom-paris.fr>
---
 ale_linters/verilog/verilator.vim | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'ale_linters/verilog/verilator.vim')

diff --git a/ale_linters/verilog/verilator.vim b/ale_linters/verilog/verilator.vim
index 029dd4c9..006e310d 100644
--- a/ale_linters/verilog/verilator.vim
+++ b/ale_linters/verilog/verilator.vim
@@ -7,16 +7,11 @@ if !exists('g:ale_verilog_verilator_options')
 endif
 
 function! ale_linters#verilog#verilator#GetCommand(buffer) abort
-    let l:filename = ale#util#Tempname() . '_verilator_linted.v'
-
-    " Create a special filename, so we can detect it in the handler.
-    call ale#command#ManageFile(a:buffer, l:filename)
-    let l:lines = getbufline(a:buffer, 1, '$')
-    call ale#util#Writefile(a:buffer, l:lines, l:filename)
-
+    " the path to the current file is systematically added to the search path
     return 'verilator --lint-only -Wall -Wno-DECLFILENAME '
+    \   . '-I%s:h '
     \   . ale#Var(a:buffer, 'verilog_verilator_options') .' '
-    \   . ale#Escape(l:filename)
+    \   . '%t'
 endfunction
 
 function! ale_linters#verilog#verilator#Handle(buffer, lines) abort
@@ -34,7 +29,7 @@ function! ale_linters#verilog#verilator#Handle(buffer, lines) abort
     "
     " to stay compatible with old versions of the tool, the column number is
     " optional in the researched pattern
-    let l:pattern = '^%\(Warning\|Error\)[^:]*:\([^:]\+\):\(\d\+\):\(\d\+\)\?:\? \(.\+\)$'
+    let l:pattern = '^%\(Warning\|Error\)[^:]*:\s*\([^:]\+\):\(\d\+\):\(\d\+\)\?:\? \(.\+\)$'
     let l:output = []
 
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
@@ -42,17 +37,14 @@ function! ale_linters#verilog#verilator#Handle(buffer, lines) abort
         \   'lnum': str2nr(l:match[3]),
         \   'text': l:match[5],
         \   'type': l:match[1] is# 'Error' ? 'E' : 'W',
+        \   'filename': l:match[2],
         \}
 
         if !empty(l:match[4])
             let l:item.col = str2nr(l:match[4])
         endif
 
-        let l:file = l:match[2]
-
-        if l:file =~# '_verilator_linted.v'
-            call add(l:output, l:item)
-        endif
+        call add(l:output, l:item)
     endfor
 
     return l:output
-- 
cgit v1.2.3