From 78556aba7d0934ba92de376c267e3e82f4f77f1d Mon Sep 17 00:00:00 2001 From: TJ DeVries Date: Fri, 9 Oct 2020 15:39:59 -0400 Subject: api: nvim_buf_delete --- src/nvim/api/buffer.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'src/nvim/api/buffer.c') diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c index c8dd85b39d..ac23c6df92 100644 --- a/src/nvim/api/buffer.c +++ b/src/nvim/api/buffer.c @@ -953,6 +953,61 @@ Boolean nvim_buf_is_loaded(Buffer buffer) 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| +/// +/// @param buffer Buffer handle, or 0 for current buffer +/// @param opts Optional parameters. Keys: +/// - force: Force deletion and ignore unsaved changes. +/// - unload: Unloaded only, do not delete. See |:bunload| +void nvim_buf_delete(Buffer buffer, Dictionary opts, Error *err) + FUNC_API_SINCE(7) +{ + buf_T *buf = find_buffer_by_handle(buffer, err); + + if (ERROR_SET(err)) { + return; + } + + bool force = false; + bool unload = false; + for (size_t i = 0; i < opts.size; i++) { + String k = opts.items[i].key; + Object *v = &opts.items[i].value; + if (strequal("force", k.data)) { + UNPACK_BOOL(force, v, "force must be a boolean") + } else if (strequal("unload", k.data)) { + UNPACK_BOOL(unload, v, "unload must be a boolean") + } else { + api_set_error(err, kErrorTypeValidation, "unexpected key: %s", k.data); + return; + } + } + + int result = do_buffer( + unload ? DOBUF_UNLOAD : DOBUF_WIPE, + DOBUF_FIRST, + FORWARD, + buf->handle, + force); + + if (result == FAIL) { + api_set_error(err, kErrorTypeException, "Failed to unload buffer."); + return; + } +} + /// Checks if a buffer is valid. /// /// @note Even if a buffer is valid it may have been unloaded. See |api-buffer| -- cgit From 1afe6dd2f4578fa7e6758565db36fa36db72b236 Mon Sep 17 00:00:00 2001 From: TJ DeVries Date: Tue, 20 Oct 2020 20:26:53 -0400 Subject: fixup: bfredl comments --- src/nvim/api/buffer.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'src/nvim/api/buffer.c') diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c index ac23c6df92..3c585fd1fd 100644 --- a/src/nvim/api/buffer.c +++ b/src/nvim/api/buffer.c @@ -953,18 +953,6 @@ Boolean nvim_buf_is_loaded(Buffer buffer) 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| /// /// @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; Object *v = &opts.items[i].value; 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)) { - UNPACK_BOOL(unload, v, "unload must be a boolean") + unload = api_coerce_to_bool(*v, "unload", false, err); } else { api_set_error(err, kErrorTypeValidation, "unexpected key: %s", k.data); return; } } + if (ERROR_SET(err)) { + return; + } + int result = do_buffer( unload ? DOBUF_UNLOAD : DOBUF_WIPE, DOBUF_FIRST, @@ -1449,7 +1441,7 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id, goto error; } } 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)) { goto error; } -- cgit From a83b76790b82c8f9e74b82c8b0061682b66ddd0d Mon Sep 17 00:00:00 2001 From: TJ DeVries Date: Thu, 22 Oct 2020 16:21:35 -0400 Subject: fixup: fixup: fixup: fixup: --- src/nvim/api/buffer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/nvim/api/buffer.c') diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c index 3c585fd1fd..cad4c8314f 100644 --- a/src/nvim/api/buffer.c +++ b/src/nvim/api/buffer.c @@ -972,11 +972,11 @@ void nvim_buf_delete(Buffer buffer, Dictionary opts, Error *err) bool unload = false; for (size_t i = 0; i < opts.size; i++) { String k = opts.items[i].key; - Object *v = &opts.items[i].value; + Object v = opts.items[i].value; if (strequal("force", k.data)) { - force = api_coerce_to_bool(*v, "force", false, err); + force = api_coerce_to_bool(v, "force", false, err); } else if (strequal("unload", k.data)) { - unload = api_coerce_to_bool(*v, "unload", false, err); + unload = api_coerce_to_bool(v, "unload", false, err); } else { api_set_error(err, kErrorTypeValidation, "unexpected key: %s", k.data); return; -- cgit From c146eddc8b768f1cd395ea0ce54c19e64eff0c08 Mon Sep 17 00:00:00 2001 From: Björn Linse Date: Tue, 8 Sep 2020 09:47:10 +0200 Subject: api: add API for themes co-author: hlpr98 (dict2hlattrs function) orange is sus?? NOVEMBER DAWN erase the lie that is redraw_later() --- src/nvim/api/buffer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/nvim/api/buffer.c') diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c index cad4c8314f..4569ebc713 100644 --- a/src/nvim/api/buffer.c +++ b/src/nvim/api/buffer.c @@ -974,9 +974,9 @@ void nvim_buf_delete(Buffer buffer, Dictionary opts, Error *err) String k = opts.items[i].key; Object v = opts.items[i].value; if (strequal("force", k.data)) { - force = api_coerce_to_bool(v, "force", false, err); + force = api_object_to_bool(v, "force", false, err); } else if (strequal("unload", k.data)) { - unload = api_coerce_to_bool(v, "unload", false, err); + unload = api_object_to_bool(v, "unload", false, err); } else { api_set_error(err, kErrorTypeValidation, "unexpected key: %s", k.data); return; @@ -1441,7 +1441,7 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id, goto error; } } else if (strequal("ephemeral", k.data)) { - ephemeral = api_coerce_to_bool(*v, "ephemeral", false, err); + ephemeral = api_object_to_bool(*v, "ephemeral", false, err); if (ERROR_SET(err)) { goto error; } -- cgit