Merge pull request #3475 from benknoble/dafny-include-timeouts

dafny: add a timeLimit option and message-parsing

4 files changed, 44 insertions, 3 deletions

diff --git a/ale_linters/dafny/dafny.vim b/ale_linters/dafny/dafny.vim
index e6021d99..de7a7bb8 100644
--- a/ale_linters/dafny/dafny.vim
+++ b/ale_linters/dafny/dafny.vim
@@ -14,13 +14,28 @@ function! ale_linters#dafny#dafny#Handle(buffer, lines) abort
         \ })
     endfor
 
+    for l:match in ale#util#GetMatches(a:lines, '\v(.*)\((\d+),(\d+)\): (Verification of .{-} timed out after \d+ seconds)')
+        call add(l:output, {
+        \     'bufnr': a:buffer,
+        \     'col': l:match[3] + 0,
+        \     'lnum': l:match[2] + 0,
+        \     'text': l:match[4],
+        \     'type': 'E',
+        \ })
+    endfor
+
     return l:output
 endfunction
 
+function! ale_linters#dafny#dafny#GetCommand(buffer) abort
+    return printf('dafny %%s /compile:0 /timeLimit:%d', ale#Var(a:buffer, 'dafny_dafny_timelimit'))
+endfunction
+
+call ale#Set('dafny_dafny_timelimit', 10)
 call ale#linter#Define('dafny', {
 \    'name': 'dafny',
 \    'executable': 'dafny',
-\    'command': 'dafny %s /compile:0',
+\    'command': function('ale_linters#dafny#dafny#GetCommand'),
 \    'callback': 'ale_linters#dafny#dafny#Handle',
 \    'lint_file': 1,
 \ })
diff --git a/doc/ale-dafny.txt b/doc/ale-dafny.txt
new file mode 100644
index 00000000..005170ad
--- /dev/null
+++ b/doc/ale-dafny.txt
@@ -0,0 +1,16 @@
+===============================================================================
+ALE Dafny Integration                                       *ale-dafny-options*
+
+
+===============================================================================
+dafny                                                         *ale-dafny-dafny*
+
+g:ale_dafny_dafny_timelimit                       *g:ale_dafny_dafny_timelimit*
+                                                  *b:ale_dafny_dafny_timelimit*
+  Type: |Number|
+  Default: `10`
+
+  This variable sets the `/timeLimit` used for dafny.
+
+
+  vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/doc/ale.txt b/doc/ale.txt
index 09a95b25..c538cb09 100644
--- a/doc/ale.txt
+++ b/doc/ale.txt
@@ -2661,6 +2661,8 @@ documented in additional help files.
     dfmt..................................|ale-d-dfmt|
     dls...................................|ale-d-dls|
     uncrustify............................|ale-d-uncrustify|
+  dafny...................................|ale-dafny-options|
+    dafny.................................|ale-dafny-dafny|
   dart....................................|ale-dart-options|
     dartanalyzer..........................|ale-dart-dartanalyzer|
     dartfmt...............................|ale-dart-dartfmt|
diff --git a/test/handler/test_dafny_handler.vader b/test/handler/test_dafny_handler.vader
index 797d348e..472615ac 100644
--- a/test/handler/test_dafny_handler.vader
+++ b/test/handler/test_dafny_handler.vader
@@ -20,9 +20,17 @@ Execute(The Dafny handler should parse output correctly):
   \     'lnum': 678,
   \     'text': 'This is the precondition that might not hold.',
   \     'type': 'W'
-  \   }
+  \   },
+  \   {
+  \     'bufnr': 0,
+  \     'col': 45,
+  \     'lnum': 123,
+  \     'text': "Verification of 'Impl$$_22_Proof.__default.PutKeepsMapsFull' timed out after 2 seconds",
+  \     'type': 'E'
+  \   },
   \ ],
   \ ale_linters#dafny#dafny#Handle(0, [
   \ 'File.dfy(123,45): Error BP5002: A precondition for this call might not hold.',
-  \ 'File.dfy(678,90): Related location: This is the precondition that might not hold.'
+  \ 'File.dfy(678,90): Related location: This is the precondition that might not hold.',
+  \ "File.dfy(123,45): Verification of 'Impl$$_22_Proof.__default.PutKeepsMapsFull' timed out after 2 seconds",
   \ ])