Port to Neovim: Add compatibility layer for job control functions

Author: mcepl

plugin/acme.vim

@@ -74,7 +74,7 @@ function AcmeStatusFlags()
 endfunc
 
 function AcmeStatusJobs()
-	return join(map(s:Jobs(bufnr()), '"{".v:val.cmd."}"'), '')
+	return join(map(s:Jobs(bufnr()), {_, v -> '"{'.v.cmd.'}"'}), '')
 endfunc
 
 function AcmeStatusRuler()
@@ -87,7 +87,7 @@ function s:Started(job, buf, cmd)
 		\ 'h': a:job,
 		\ 'cmd': type(a:cmd) == type([]) ? join(a:cmd) : a:cmd,
 		\ 'killed': 0,
-	\ })
+		\ })
 	redrawstatus!
 endfunc
 
@@ -100,11 +100,11 @@ function s:RemoveJob(i, status)
 	else
 		checktime
 		call s:ReloadDirs()
-		let sig = job_info(job.h).termsig
+		let sig = s:JobInfo(job.h).termsig
 		if a:status == 0
 			echo 'Done:' job.cmd
 		elseif sig != '' && !job.killed
-			let name = bufname(ch_getbufnr(job.h, 'out'))
+			let name = bufname(s:GetJobBufNr(job.h))
 			call s:ErrorOpen(name, [toupper(sig).': '.job.cmd])
 		endif
 	endif
@@ -121,11 +121,13 @@ endfunc
 
 function s:Kill(p)
 	for job in s:Jobs(a:p)
-		let ch = job_getchannel(job.h)
-		if string(ch) != 'channel fail'
-			call ch_close(ch)
+		if !has('nvim')
+			let ch = job_getchannel(job.h)
+			if string(ch) != 'channel fail'
+				call ch_close(ch)
+			endif
 		endif
-		call job_stop(job.h)
+		call s:JobStop(job.h)
 		let job.killed = 1
 	endfor
 endfunc
@@ -156,8 +158,8 @@ function s:Send(w, inp)
 	endif
 	let inp = split(inp, '\n')
 	let job = s:Jobs(b)[0].h
-	call ch_setoptions(job, {'callback': ''})
-	call ch_sendraw(job, join(inp, "\n")."\n")
+	call s:ChanSetCallback(job, '')
+	call s:ChanSend(job, join(inp, "\n")."\n")
 endfunc
 
 function s:Receiver(b)
@@ -182,6 +184,61 @@ function s:ArgvAxec(cmd, cwd)
 		\ ? [s:avimdir.'/bin/axec'] + argv : argv
 endfunc
 
+function s:JobStop(job)
+	if has('nvim')
+		silent! call jobstop(a:job)
+	else
+		call job_stop(a:job)
+	endif
+endfunc
+
+function s:ChanSend(job, data)
+	if has('nvim')
+		call chansend(a:job, a:data)
+	else
+		call ch_sendraw(a:job, a:data)
+	endif
+endfunc
+
+function s:ChanCloseIn(job)
+	if has('nvim')
+		call chanclose(a:job, 'stdin')
+	else
+		call ch_close_in(a:job)
+	endif
+endfunc
+
+function s:ChanSetCallback(job, cb)
+	if has('nvim')
+		if has_key(s:nvim_jobs, a:job)
+			let s:nvim_jobs[a:job].callback = a:cb
+		endif
+	else
+		call ch_setoptions(a:job, {'callback': a:cb})
+	endif
+endfunc
+
+function s:JobInfo(job)
+	if has('nvim')
+		let s = jobwait([a:job], 0)[0]
+		let sig = ''
+		if s > 128
+			let sig = s == 130 ? 'int' : s == 143 ? 'term' : s == 129 ? 'hup' : 'sig'.(s-128)
+		endif
+		return {'termsig': sig}
+	else
+		return job_info(a:job)
+	endif
+endfunc
+
+function s:GetJobBufNr(job)
+	if has('nvim')
+		return get(get(s:nvim_jobs, a:job, {}), 'buf', -1)
+	else
+		return ch_getbufnr(a:job, 'out')
+	endif
+endfunc
+
 function s:JobEnv(buf)
 	return {
 		\ 'ACMEVIMBUF': a:buf,
@@ -190,7 +247,7 @@ function s:JobEnv(buf)
 			\ &buftype == '' ? expand('%:t') : '',
 		\ 'COLUMNS': 80,
 		\ 'LINES': 24,
-	\ }
+		\ }
 endfunc
 
 function s:SetEnv(env)
@@ -209,7 +266,7 @@ function s:JobStart(cmd, outb, ctxb, opts, inp)
 		\ 'out_io': 'buffer',
 		\ 'out_buf': a:outb,
 		\ 'out_msg': 0,
-	\ }
+		\ }
 	call extend(opts, a:opts)
 	let cwd = get(a:opts, 'cwd', getcwd())
 	let env = s:SetEnv(s:JobEnv(a:outb))
@@ -270,7 +327,7 @@ function s:ErrorOpen(name, ...)
 		exe w.'wincmd w'
 		let b = s:ErrorLoad(a:name)
 		for job in s:jobs
-			if ch_getbufnr(job.h, 'out') == b && job.buf != b
+			if s:GetJobBufNr(job.h) == b && job.buf != b
 				let job.buf = b
 			endif
 		endfor
@@ -290,7 +347,7 @@ endfunc
 
 function s:ErrorCb(b, ch, msg)
 	call s:ErrorOpen(bufname(a:b))
-	call ch_setoptions(a:ch, {'callback': ''})
+	call s:ChanSetCallback(a:ch, '')
 endfunc
 
 function s:ErrorExec(cmd, dir, b, inp)
@@ -389,7 +446,7 @@ function s:ScratchCb(b, ch, msg)
 		let w = win_getid(w)
 		if line('$', w) > 1
 			call win_execute(w, 'noa normal! gg0')
-			call ch_setoptions(a:ch, {'callback': ''})
+			call s:ChanSetCallback(a:ch, '')
 		endif
 	endif
 endfunc
@@ -400,19 +457,23 @@ function s:ScratchExec(cmd, dir, inp, title)
 	let opts = {
 		\ 'callback': function('s:ScratchCb', [b]),
 		\ 'in_io': 'pipe',
-	\ }
+		\ }
 	if a:dir != ''
 		let opts.cwd = a:dir
 	endif
 	call s:JobStart(a:cmd, b, b, opts, a:inp)
 endfunc
 
 function s:Exec(cmd)
-	silent! call job_start(s:Argv(a:cmd), {
-		\ 'err_io': 'null',
-		\ 'in_io': 'null',
-		\ 'out_io': 'null',
-	\ })
+	if has('nvim')
+		silent! call jobstart(s:Argv(a:cmd), {'detach': 1})
+	else
+		silent! call job_start(s:Argv(a:cmd), {
+			\ 'err_io': 'null',
+			\ 'in_io': 'null',
+			\ 'out_io': 'null',
+			\ })
+	endif
 endfunc
 
 function s:BufWidth(b)
@@ -535,7 +596,7 @@ endfunc
 function s:CtxDir()
 	let dir = s:Dir()
 	if &buftype != ''
-		let [t, q] = ['ing directory:? ', "[`'\"]"]
+		let [t, q] = ['ing directory:? ', "[`'\"`]"]
 		let l = searchpair('\vEnter'.t.q, '', '\vLeav'.t.q, 'nW',
 			\ '', 0, 50)
 		let m = matchlist(getline(l), '\vLeav'.t.q.'(.+)'.q)
@@ -623,7 +684,7 @@ let s:plumbing = [
 	\ [],
 	\ ['\f+', {m -> m[0] !~ '/' && AcmeOpen(exepath(m[0]), '')}],
 	\ ['\d+%([:,]\d+)?', {m -> s:Goto(m[0])}],
-\ ]
+	\ ]
 
 function s:Open(text, click, dir, win)
 	let s:plumbclick = a:click
@@ -742,7 +803,7 @@ endfunc
 
 function s:Scroll(topline)
 	let v = winsaveview()
-	let v.topline = a:topline
+	v.topline = a:topline
 	call winrestview(v)
 endfunc
 
@@ -789,8 +850,8 @@ function s:Layout(col)
 			let s = float2nr(h / (n * (n > s:tops ? 1.75 : 1)))
 		endif
 		call win_move_statusline(win_id2win(w) - 1, winheight(w) - s)
-		let h -= s
-		let n -= 1
+		h -= s
+		n -= 1
 	endfor
 	call timer_start(0, {_ -> s:Fit(a:col)})
 endfunc
@@ -900,13 +961,13 @@ function s:RightRelease(click)
 		return
 	endif
 	exe "normal! \<LeftRelease>"
-	let click = s:clicksel ? -1 : a:click
-	let text = click <= 0 ? trim(s:Sel()[0], "\r\n", 2) : getline('.')
+	let cmd = a:click <= 0 || s:clicksel ? s:Sel()[0] : expand('<cWORD>')
+	let vis = s:clickmode == 'v' && (a:click <= 0 || !s:clicksel)
 	call s:RestVisual(s:visual)
 	let w = win_getid()
 	let dir = s:CtxDir()
 	exe win_id2win(s:clickwin).'wincmd w'
-	call s:Open(text, click, dir, w)
+	call s:Open(cmd, a:click, dir, w)
 endfunc
 
 for m in ['', 'i']
@@ -945,7 +1006,7 @@ function s:Clear(b)
 	if has_key(s:scratch, a:b)
 		let s:scratch[a:b].cleared = 1
 		for job in s:Jobs(a:b)
-			call ch_setoptions(job.h, {'callback': ''})
+			call s:ChanSetCallback(job.h, '')
 		endfor
 	endif
 endfunc
@@ -1021,7 +1082,7 @@ endfunc
 function s:PtyPw()
 	let pw = inputsecret('PW> ')
 	for job in s:Jobs(bufnr())
-		call ch_sendraw(job.h, pw."\n")
+		call s:ChanSend(job.h, pw."\n")
 	endfor
 endfunc
 
@@ -1037,7 +1098,7 @@ function s:Pty(b)
 	if !has_key(s:scratch, a:b) || w == 0
 		return
 	endif
-	let s:scratch[a:b].pty = 1
+	s:scratch[a:b].pty = 1
 	call win_execute(w, 'call s:PtyMap()')
 endfunc
 
@@ -1070,7 +1131,8 @@ function s:Look(p)
 	else
 		let hl = 1
 		let p = map(a:p[1:-2], {i, v -> escape(v, '\/')})
-		let @/ = '\V'.a:p[0].'\%\('.join(p, '\|').'\)'.a:p[-1]
+		let @/ = '\V'.a:p[0].'\%('.join(p, '\|').'\)'.a:p[-1]
+		call feedkeys(":let v:hlsearch=1\<CR>", 'n')
 	endif
 	let esc = mode() == 'i' ? "\<C-o>" : ""
 	call feedkeys(esc.":let v:hlsearch=".hl."\<CR>", 'n')
@@ -1150,7 +1212,7 @@ function s:CtrlRecv(ch, data)
 endfunc
 
 function s:CtrlSend(msg)
-	call ch_sendraw(s:ctrl, join(a:msg, "\x1f") . "\x1e")
+	call s:ChanSend(s:ctrl, join(a:msg, "\x1f") . "\x1e")
 endfunc
 
 function s:BufWinLeave()
@@ -1233,12 +1295,23 @@ let s:jobs = []
 let s:minimized = {}
 let s:scratch = {}
 let s:tops = 1
+let s:nvim_jobs = {}
 
 if s:ctrlexe != ''
-	let s:ctrl = job_start([s:ctrlexe], {
-		\ 'callback': 's:CtrlRecv',
-		\ 'err_io': 'null',
-		\ 'mode': 'raw',
-	\ })
+	if has('nvim')
+		function s:NvimCtrlRecv(id, data, event)
+			call s:CtrlRecv(a:id, join(a:data, "\n"))
+		endfunc
+		let s:ctrl = jobstart([s:ctrlexe], {
+			\ 'on_stdout': function('s:NvimCtrlRecv'),
+			\ 'rpc': 0,
+		\ })
+	else
+		let s:ctrl = job_start([s:ctrlexe], {
+			\ 'callback': 's:CtrlRecv',
+			\ 'err_io': 'null',
+			\ 'mode': 'raw',
+		\ })
+	endif
 	let $EDITOR = s:ctrlexe
 endif