From e455d8219e746856e0aa539712e010528ded8df0 Mon Sep 17 00:00:00 2001
From: w0rp <devw0rp@gmail.com>
Date: Wed, 14 Jun 2017 17:08:39 +0100
Subject: [PATCH] Fix #649 - Support tsserver linting for NeoVim

---
 autoload/ale/job.vim      | 16 ++++++++---
 test/test_line_join.vader | 57 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/autoload/ale/job.vim b/autoload/ale/job.vim
index f4dc1252..b9ab86b7 100644
--- a/autoload/ale/job.vim
+++ b/autoload/ale/job.vim
@@ -24,7 +24,7 @@ function! s:KillHandler(timer) abort
 endfunction
 
 " Note that jobs and IDs are the same thing on NeoVim.
-function! ale#job#JoinNeovimOutput(job, last_line, data, callback) abort
+function! ale#job#JoinNeovimOutput(job, last_line, data, mode, callback) abort
     let l:lines = a:data[:-2]
 
     if len(a:data) > 1
@@ -34,9 +34,15 @@ function! ale#job#JoinNeovimOutput(job, last_line, data, callback) abort
         let l:new_last_line = a:last_line . a:data[0]
     endif
 
-    for l:line in l:lines
-        call a:callback(a:job, l:line)
-    endfor
+    if a:mode ==# 'raw'
+        if !empty(l:lines)
+            call a:callback(a:job, join(l:lines, "\n") . "\n")
+        endif
+    else
+        for l:line in l:lines
+            call a:callback(a:job, l:line)
+        endfor
+    endif
 
     return l:new_last_line
 endfunction
@@ -49,6 +55,7 @@ function! s:NeoVimCallback(job, data, event) abort
         \   a:job,
         \   l:info.out_cb_line,
         \   a:data,
+        \   l:info.mode,
         \   ale#util#GetFunction(l:info.out_cb),
         \)
     elseif a:event ==# 'stderr'
@@ -56,6 +63,7 @@ function! s:NeoVimCallback(job, data, event) abort
         \   a:job,
         \   l:info.err_cb_line,
         \   a:data,
+        \   l:info.mode,
         \   ale#util#GetFunction(l:info.err_cb),
         \)
     else
diff --git a/test/test_line_join.vader b/test/test_line_join.vader
index 389632b9..04264296 100644
--- a/test/test_line_join.vader
+++ b/test/test_line_join.vader
@@ -1,47 +1,90 @@
 Before:
   let g:lines = []
+  let g:data = ''
 
-  function LineCallback(job_id, line) abort
+  function! LineCallback(job_id, line) abort
     call add(g:lines, a:line)
   endfunction
 
+  function! RawCallback(job_id, some_data) abort
+    let g:data .= a:some_data
+  endfunction
+
 After:
   unlet! g:last_line
   unlet! g:lines
+  unlet! g:data
   delfunction LineCallback
+  delfunction RawCallback
 
 Execute (ALE should pass on full lines for NeoVim):
-  let g:last_line = ale#job#JoinNeovimOutput(1, '', ['x', 'y', ''], function('LineCallback'))
+  let g:last_line = ale#job#JoinNeovimOutput(1, '', ['x', 'y', ''], 'nl', function('LineCallback'))
 
   AssertEqual ['x', 'y'], g:lines
   AssertEqual '', g:last_line
 
 Execute (ALE should pass on a single long line):
-  let g:last_line = ale#job#JoinNeovimOutput(1, '', ['x'], function('LineCallback'))
+  let g:last_line = ale#job#JoinNeovimOutput(1, '', ['x'], 'nl', function('LineCallback'))
 
   AssertEqual [], g:lines
   AssertEqual 'x', g:last_line
 
 Execute (ALE should handle just a single line of output):
-  let g:last_line = ale#job#JoinNeovimOutput(1, '', ['x', ''], function('LineCallback'))
+  let g:last_line = ale#job#JoinNeovimOutput(1, '', ['x', ''], 'nl', function('LineCallback'))
 
   AssertEqual ['x'], g:lines
   AssertEqual '', g:last_line
 
 Execute (ALE should join two incomplete pieces of large lines together):
-  let g:last_line = ale#job#JoinNeovimOutput(1, 'x', ['y'], function('LineCallback'))
+  let g:last_line = ale#job#JoinNeovimOutput(1, 'x', ['y'], 'nl', function('LineCallback'))
 
   AssertEqual [], g:lines
   AssertEqual 'xy', g:last_line
 
 Execute (ALE join incomplete lines, and set new ones):
-  let g:last_line = ale#job#JoinNeovimOutput(1, 'x', ['y', 'z', 'a'], function('LineCallback'))
+  let g:last_line = ale#job#JoinNeovimOutput(1, 'x', ['y', 'z', 'a'], 'nl', function('LineCallback'))
 
   AssertEqual ['xy', 'z'], g:lines
   AssertEqual 'a', g:last_line
 
 Execute (ALE join incomplete lines, and set new ones, with two elements):
-  let g:last_line = ale#job#JoinNeovimOutput(1, 'x', ['y', 'z'], function('LineCallback'))
+  let g:last_line = ale#job#JoinNeovimOutput(1, 'x', ['y', 'z'], 'nl', function('LineCallback'))
 
   AssertEqual ['xy'], g:lines
   AssertEqual 'z', g:last_line
+
+Execute (ALE should pass on full lines for NeoVim for raw data):
+  let g:last_line = ale#job#JoinNeovimOutput(1, '', ['x', 'y', ''], 'raw', function('RawCallback'))
+
+  AssertEqual "x\ny\n", g:data
+  AssertEqual '', g:last_line
+
+Execute (ALE should pass on a single long line):
+  let g:last_line = ale#job#JoinNeovimOutput(1, '', ['x'], 'raw', function('RawCallback'))
+
+  AssertEqual '', g:data
+  AssertEqual 'x', g:last_line
+
+Execute (ALE should handle just a single line of output):
+  let g:last_line = ale#job#JoinNeovimOutput(1, '', ['x', ''], 'raw', function('RawCallback'))
+
+  AssertEqual "x\n", g:data
+  AssertEqual '', g:last_line
+
+Execute (ALE should join two incomplete pieces of large lines together):
+  let g:last_line = ale#job#JoinNeovimOutput(1, 'x', ['y'], 'raw', function('RawCallback'))
+
+  AssertEqual '', g:data
+  AssertEqual 'xy', g:last_line
+
+Execute (ALE join incomplete lines, and set new ones):
+  let g:last_line = ale#job#JoinNeovimOutput(1, 'x', ['y', 'z', 'a'], 'raw', function('RawCallback'))
+
+  AssertEqual "xy\nz\n", g:data
+  AssertEqual 'a', g:last_line
+
+Execute (ALE join incomplete lines, and set new ones, with two elements):
+  let g:last_line = ale#job#JoinNeovimOutput(1, 'x', ['y', 'z'], 'raw', function('RawCallback'))
+
+  AssertEqual "xy\n", g:data
+  AssertEqual 'z', g:last_line