mirror of
https://github.com/neovim/neovim.git
synced 2025-09-15 07:48:18 +00:00
@@ -18987,7 +18987,7 @@ void ex_function(exarg_T *eap)
|
|||||||
emsg_funcname(e_funcexts, name);
|
emsg_funcname(e_funcexts, name);
|
||||||
goto erret;
|
goto erret;
|
||||||
}
|
}
|
||||||
if (fp->uf_calls > 0) {
|
if (fp->uf_refcount > 1 || fp->uf_calls > 0) {
|
||||||
emsg_funcname(N_("E127: Cannot redefine function %s: It is in use"),
|
emsg_funcname(N_("E127: Cannot redefine function %s: It is in use"),
|
||||||
name);
|
name);
|
||||||
goto erret;
|
goto erret;
|
||||||
@@ -21136,14 +21136,18 @@ static inline bool common_job_start(TerminalJobData *data, typval_T *rettv)
|
|||||||
{
|
{
|
||||||
data->refcount++;
|
data->refcount++;
|
||||||
Process *proc = (Process *)&data->proc;
|
Process *proc = (Process *)&data->proc;
|
||||||
|
char *cmd = xstrdup(proc->argv[0]);
|
||||||
if (!process_spawn(proc)) {
|
if (!process_spawn(proc)) {
|
||||||
EMSG(_(e_jobexe));
|
EMSG2(_(e_jobspawn), cmd);
|
||||||
|
xfree(cmd);
|
||||||
if (proc->type == kProcessTypePty) {
|
if (proc->type == kProcessTypePty) {
|
||||||
xfree(data->proc.pty.term_name);
|
xfree(data->proc.pty.term_name);
|
||||||
free_term_job_data(data);
|
|
||||||
}
|
}
|
||||||
|
rettv->vval.v_number = proc->status;
|
||||||
|
term_job_data_decref(data);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
xfree(cmd);
|
||||||
|
|
||||||
data->id = current_job_id++;
|
data->id = current_job_id++;
|
||||||
wstream_init(proc->in, 0);
|
wstream_init(proc->in, 0);
|
||||||
|
@@ -66,7 +66,12 @@ bool process_spawn(Process *proc) FUNC_ATTR_NONNULL_ALL
|
|||||||
if (proc->err) {
|
if (proc->err) {
|
||||||
uv_close((uv_handle_t *)&proc->err->uv.pipe, NULL);
|
uv_close((uv_handle_t *)&proc->err->uv.pipe, NULL);
|
||||||
}
|
}
|
||||||
process_close(proc);
|
|
||||||
|
if (proc->type == kProcessTypeUv) {
|
||||||
|
uv_close((uv_handle_t *)&(((UvProcess *)proc)->uv), NULL);
|
||||||
|
} else {
|
||||||
|
process_close(proc);
|
||||||
|
}
|
||||||
shell_free_argv(proc->argv);
|
shell_free_argv(proc->argv);
|
||||||
proc->status = -1;
|
proc->status = -1;
|
||||||
return false;
|
return false;
|
||||||
|
@@ -1107,6 +1107,8 @@ EXTERN char_u e_isadir2[] INIT(= N_("E17: \"%s\" is a directory"));
|
|||||||
EXTERN char_u e_invjob[] INIT(= N_("E900: Invalid job id"));
|
EXTERN char_u e_invjob[] INIT(= N_("E900: Invalid job id"));
|
||||||
EXTERN char_u e_jobtblfull[] INIT(= N_("E901: Job table is full"));
|
EXTERN char_u e_jobtblfull[] INIT(= N_("E901: Job table is full"));
|
||||||
EXTERN char_u e_jobexe[] INIT(= N_("E902: \"%s\" is not an executable"));
|
EXTERN char_u e_jobexe[] INIT(= N_("E902: \"%s\" is not an executable"));
|
||||||
|
EXTERN char_u e_jobspawn[] INIT(= N_(
|
||||||
|
"E903: Process for command \"%s\" could not be spawned"));
|
||||||
EXTERN char_u e_jobnotpty[] INIT(= N_("E904: Job is not connected to a pty"));
|
EXTERN char_u e_jobnotpty[] INIT(= N_("E904: Job is not connected to a pty"));
|
||||||
EXTERN char_u e_libcall[] INIT(= N_("E364: Library call failed for \"%s()\""));
|
EXTERN char_u e_libcall[] INIT(= N_("E364: Library call failed for \"%s()\""));
|
||||||
EXTERN char_u e_mkdir[] INIT(= N_("E739: Cannot create directory %s: %s"));
|
EXTERN char_u e_mkdir[] INIT(= N_("E739: Cannot create directory %s: %s"));
|
||||||
|
@@ -6,6 +6,7 @@ local clear, eq, eval, execute, expect, feed, insert, neq, next_msg, nvim,
|
|||||||
helpers.insert, helpers.neq, helpers.next_message, helpers.nvim,
|
helpers.insert, helpers.neq, helpers.next_message, helpers.nvim,
|
||||||
helpers.nvim_dir, helpers.ok, helpers.run, helpers.session, helpers.source,
|
helpers.nvim_dir, helpers.ok, helpers.run, helpers.session, helpers.source,
|
||||||
helpers.stop, helpers.wait, helpers.write_file
|
helpers.stop, helpers.wait, helpers.write_file
|
||||||
|
local Screen = require('test.functional.ui.screen')
|
||||||
|
|
||||||
|
|
||||||
describe('jobs', function()
|
describe('jobs', function()
|
||||||
@@ -188,6 +189,41 @@ describe('jobs', function()
|
|||||||
eq({'notification', 'exit', {45, 10}}, next_msg())
|
eq({'notification', 'exit', {45, 10}}, next_msg())
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
it('cant redefine callbacks being used by a job', function()
|
||||||
|
local screen = Screen.new()
|
||||||
|
screen:attach()
|
||||||
|
local script = [[
|
||||||
|
function! g:JobHandler(job_id, data, event)
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
let g:callbacks = {
|
||||||
|
\ 'on_stdout': function('g:JobHandler'),
|
||||||
|
\ 'on_stderr': function('g:JobHandler'),
|
||||||
|
\ 'on_exit': function('g:JobHandler')
|
||||||
|
\ }
|
||||||
|
let job = jobstart('cat -', g:callbacks)
|
||||||
|
]]
|
||||||
|
source(script)
|
||||||
|
feed(':function! g:JobHandler(job_id, data, event)<cr>')
|
||||||
|
feed(':endfunction<cr>')
|
||||||
|
screen:expect([[
|
||||||
|
~ |
|
||||||
|
~ |
|
||||||
|
~ |
|
||||||
|
~ |
|
||||||
|
~ |
|
||||||
|
~ |
|
||||||
|
~ |
|
||||||
|
~ |
|
||||||
|
~ |
|
||||||
|
:function! g:JobHandler(job_id, data, event) |
|
||||||
|
: :endfunction |
|
||||||
|
E127: Cannot redefine function JobHandler: It is in u|
|
||||||
|
se |
|
||||||
|
Press ENTER or type command to continue^ |
|
||||||
|
]])
|
||||||
|
end)
|
||||||
|
|
||||||
describe('jobwait', function()
|
describe('jobwait', function()
|
||||||
it('returns a list of status codes', function()
|
it('returns a list of status codes', function()
|
||||||
source([[
|
source([[
|
||||||
|
Reference in New Issue
Block a user