mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 02:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): improve autocmd error handling

Browse Source 
- nvim_del_augroup_* now works with pcall
- nvim_del_autocmd now errors for invalid ids
This commit is contained in:
Lewis Russell
2022-03-31 09:59:14 +01:00
parent 1184097261
commit 929293815b
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/nvim/api/autocmd.c
View File

@@ -609,10 +609,16 @@ cleanup:
/// NOTE: Only autocommands created via the API have an id.
/// @param id Integer The id returned by nvim_create_autocmd
/// @see |nvim_create_autocmd()|
void nvim_del_autocmd(Integer id)
void nvim_del_autocmd(Integer id, Error *err)
FUNC_API_SINCE(9)
{
autocmd_delete_id(id);
if (id <= 0) {
api_set_error(err, kErrorTypeException, "Invalid autocmd id");
return;
}
if (!autocmd_delete_id(id)) {
api_set_error(err, kErrorTypeException, "Failed to delete autocmd");
}
}
/// Create or get an autocommand group |autocmd-groups|.
@@ -664,11 +670,15 @@ Integer nvim_create_augroup(uint64_t channel_id, String name, Dict(create_augrou
/// @param id Integer The id of the group.
/// @see |nvim_del_augroup_by_name()|
/// @see |nvim_create_augroup()|
void nvim_del_augroup_by_id(Integer id)
void nvim_del_augroup_by_id(Integer id, Error *err)
FUNC_API_SINCE(9)
{
char *name = augroup_name((int)id);
augroup_del(name, false);
TRY_WRAP({
try_start();
char *name = augroup_name((int)id);
augroup_del(name, false);
try_end(err);
});
}
/// Delete an autocommand group by name.
@@ -677,10 +687,14 @@ void nvim_del_augroup_by_id(Integer id)
/// this group will also be deleted and cleared. This group will no longer exist.
/// @param name String The name of the group.
/// @see |autocommand-groups|
void nvim_del_augroup_by_name(String name)
void nvim_del_augroup_by_name(String name, Error *err)
FUNC_API_SINCE(9)
{
augroup_del(name.data, false);
TRY_WRAP({
try_start();
augroup_del(name.data, false);
try_end(err);
});
}
/// Execute an autocommand |autocmd-execute|.