Support reading from both output streams, and fix PHP error parsing, which sometimes logs to stderr, sometimes stdout.

1 files changed, 10 insertions, 0 deletions

diff --git a/plugin/ale/zmain.vim b/plugin/ale/zmain.vim
index 83bb8109..8db9d8f7 100644
--- a/plugin/ale/zmain.vim
+++ b/plugin/ale/zmain.vim
@@ -184,6 +184,12 @@ function! s:ApplyLinter(buffer, linter)
             \   'on_stderr': 's:GatherOutputNeoVim',
             \   'on_exit': 's:HandleExitNeoVim',
             \})
+        elseif a:linter.output_stream ==# 'both'
+            let a:linter.job = jobstart(command, {
+            \   'on_stdout': 's:GatherOutputNeoVim',
+            \   'on_stderr': 's:GatherOutputNeoVim',
+            \   'on_exit': 's:HandleExitNeoVim',
+            \})
         else
             let a:linter.job = jobstart(command, {
             \   'on_stdout': 's:GatherOutputNeoVim',
@@ -202,6 +208,10 @@ function! s:ApplyLinter(buffer, linter)
         if a:linter.output_stream ==# 'stderr'
             " Read from stderr instead of stdout.
             let job_options.err_cb = function('s:GatherOutputVim')
+        elseif a:linter.output_stream ==# 'both'
+            " Read from both streams.
+            let job_options.out_cb = function('s:GatherOutputVim')
+            let job_options.err_cb = function('s:GatherOutputVim')
         else
             let job_options.out_cb = function('s:GatherOutputVim')
         endif