improve error handling

Author: skywind3000

plugin/asyncrun.vim

@@ -3,7 +3,7 @@
 " Maintainer: skywind3000 (at) gmail.com, 2016, 2017, 2018, 2019, 2020
 " Homepage: http://www.vim.org/scripts/script.php?script_id=5431
 "
-" Last Modified: 2021/03/28 22:06
+" Last Modified: 2021/03/29 08:58
 "
 " Run shell command in background and output to quickfix:
 "     :AsyncRun[!] [options] {cmd} ...
@@ -1129,6 +1129,8 @@ function! s:terminal_init(opts)
 	let shell = (has('nvim') == 0)? 1 : 0
 	let pos = get(a:opts, 'pos', 'bottom')
 	let pos = (pos == 'background')? 'hide' : pos
+	let cwd = a:opts.cwd
+	let cwd = (cwd != '' && isdirectory(cwd))? cwd : ''
 	if get(a:opts, 'safe', get(g:, 'asyncrun_term_safe', 0)) != 0
 		let command = s:ScriptWrite(command, 0)
 		if stridx(command, ' ') >= 0
@@ -1163,8 +1165,8 @@ function! s:terminal_init(opts)
 				let opts.term_finish = 'close'
 			endif
 			if has('patch-8.1.0230')
-				if a:opts.cwd != ''
-					let opts.cwd = a:opts.cwd
+				if cwd != ''
+					let opts.cwd = cwd
 				endif
 			endif
 			try
@@ -1178,8 +1180,8 @@ function! s:terminal_init(opts)
 		else
 			let opts = {'stoponexit':'term'}
 			let opts.exit_cb = function('s:terminal_exit')
-			if a:opts.cwd != ''
-				let opts.cwd = a:opts.cwd
+			if cwd != ''
+				let opts.cwd = cwd
 			endif
 			let jid = job_start(command, opts)
 			let bid = -1
@@ -1189,8 +1191,8 @@ function! s:terminal_init(opts)
 	else
 		let opts = {}
 		let opts.on_exit = function('s:terminal_exit')
-		if a:opts.cwd != ''
-			let opts.cwd = a:opts.cwd
+		if cwd != ''
+			let opts.cwd = cwd
 		endif
 		if pos != 'hide'
 			try
@@ -1246,11 +1248,11 @@ endfunc
 function! s:terminal_open(opts)
 	let previous = getcwd()
 	if a:opts.cwd != ''
-		call s:chdir(a:opts.cwd)
+		silent! call s:chdir(a:opts.cwd)
 	endif
 	let hr = s:terminal_init(a:opts)
 	if a:opts.cwd != ''
-		call s:chdir(previous)
+		silent! call s:chdir(previous)
 	endif
 	return hr
 endfunc
@@ -1913,7 +1915,7 @@ endfunc
 " asyncrun - version
 "----------------------------------------------------------------------
 function! asyncrun#version()
-	return '2.8.5'
+	return '2.8.6'
 endfunc