IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixup: bfredl comments

Browse Source
This commit is contained in:
TJ DeVries 2020-10-20 20:26:53 -04:00
parent 78556aba7d
commit 1afe6dd2f4
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/api/buffer.c
View File

@ -953,18 +953,6 @@ Boolean nvim_buf_is_loaded(Buffer buffer)
return buf && buf->b_ml.ml_mfp != NULL; return buf && buf->b_ml.ml_mfp != NULL;
} }
#define UNPACK_BOOL_RV(result, v, message, rv) \
if (v->type == kObjectTypeBoolean) { \
result = v->data.boolean; \
} else if (v->type == kObjectTypeInteger) { \
result = v->data.integer; \
} else { \
api_set_error(err, kErrorTypeValidation, message); \
return rv; \
}
#define UNPACK_BOOL(result, v, message) UNPACK_BOOL_RV(result, v, message, )
/// Deletes the buffer. See |:bwipeout| /// Deletes the buffer. See |:bwipeout|
/// ///
/// @param buffer Buffer handle, or 0 for current buffer /// @param buffer Buffer handle, or 0 for current buffer
@ -986,15 +974,19 @@ void nvim_buf_delete(Buffer buffer, Dictionary opts, Error *err)
String k = opts.items[i].key; String k = opts.items[i].key;
Object *v = &opts.items[i].value; Object *v = &opts.items[i].value;
if (strequal("force", k.data)) { if (strequal("force", k.data)) {
UNPACK_BOOL(force, v, "force must be a boolean") force = api_coerce_to_bool(*v, "force", false, err);
} else if (strequal("unload", k.data)) { } else if (strequal("unload", k.data)) {
UNPACK_BOOL(unload, v, "unload must be a boolean") unload = api_coerce_to_bool(*v, "unload", false, err);
} else { } else {
api_set_error(err, kErrorTypeValidation, "unexpected key: %s", k.data); api_set_error(err, kErrorTypeValidation, "unexpected key: %s", k.data);
return; return;
} }
} }
if (ERROR_SET(err)) {
return;
}
int result = do_buffer( int result = do_buffer(
unload ? DOBUF_UNLOAD : DOBUF_WIPE, unload ? DOBUF_UNLOAD : DOBUF_WIPE,
DOBUF_FIRST, DOBUF_FIRST,
@ -1449,7 +1441,7 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id,
goto error; goto error;
} }
} else if (strequal("ephemeral", k.data)) { } else if (strequal("ephemeral", k.data)) {
ephemeral = api_is_truthy(*v, "ephemeral", false, err); ephemeral = api_coerce_to_bool(*v, "ephemeral", false, err);
if (ERROR_SET(err)) { if (ERROR_SET(err)) {
goto error; goto error;
} }

4
src/nvim/api/private/helpers.c
View File

@ -1619,7 +1619,9 @@ free_exit:
return virt_text; return virt_text;
} }
bool api_is_truthy(Object obj, const char *what, bool nil_truthy, Error *err) /// Force obj to bool.
/// If it fails, returns false and sets err
bool api_coerce_to_bool(Object obj, const char *what, bool nil_truthy, Error *err)
{ {
if (obj.type == kObjectTypeBoolean) { if (obj.type == kObjectTypeBoolean) {
return obj.data.boolean; return obj.data.boolean;

2
src/nvim/screen.c
View File

@ -176,7 +176,7 @@ static bool provider_invoke(NS ns_id, const char *name, LuaRef ref,
textlock--; textlock--;
if (!ERROR_SET(&err) if (!ERROR_SET(&err)
&& api_is_truthy(ret, "provider %s retval", default_true, &err)) { && api_coerce_to_bool(ret, "provider %s retval", default_true, &err)) {
return true; return true;
} }