mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-10 21:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

change end_right_gravity error behavior

Browse Source
This commit is contained in:
chentau
2021-01-12 18:32:16 -08:00
parent 6127661024
commit 2ac0ca2025
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1449,6 +1449,7 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id,
VirtText virt_text = KV_INITIAL_VALUE; VirtText virt_text = KV_INITIAL_VALUE;
bool right_gravity = true; bool right_gravity = true;
bool end_right_gravity = false; bool end_right_gravity = false;
bool end_gravity_set = false;
for (size_t i = 0; i < opts.size; i++) { for (size_t i = 0; i < opts.size; i++) {
String k = opts.items[i].key; String k = opts.items[i].key;
@@ -1546,12 +1547,21 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id,
goto error; goto error;
} }
end_right_gravity = v->data.boolean; end_right_gravity = v->data.boolean;
end_gravity_set = true;
} else { } else {
api_set_error(err, kErrorTypeValidation, "unexpected key: %s", k.data); api_set_error(err, kErrorTypeValidation, "unexpected key: %s", k.data);
goto error; goto error;
} }
} }
// Only error out if they try to set end_right_gravity without
// setting end_col or end_line
if (line2 == -1 && col2 == 0 && end_gravity_set) {
api_set_error(err, kErrorTypeValidation,
"cannot set end_right_gravity "
"without setting end_line or end_col");
}
if (col2 >= 0) { if (col2 >= 0) {
if (line2 >= 0 && line2 < buf->b_ml.ml_line_count) { if (line2 >= 0 && line2 < buf->b_ml.ml_line_count) {
len = STRLEN(ml_get_buf(buf, (linenr_T)line2 + 1, false)); len = STRLEN(ml_get_buf(buf, (linenr_T)line2 + 1, false));
@@ -1570,14 +1580,6 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id,
col2 = 0; col2 = 0;
} }
// Only error out if they try to set end_right_gravity to true without
// setting end_col or end_line
if (line2 == 0 && col2 == 0 && end_right_gravity) {
api_set_error(err, kErrorTypeValidation,
"cannot set end_right_gravity to true "
"without setting end_line and end_col");
}
// TODO(bfredl): synergize these two branches even more // TODO(bfredl): synergize these two branches even more
if (ephemeral && decor_state.buf == buf) { if (ephemeral && decor_state.buf == buf) {
int attr_id = hl_id > 0 ? syn_id2attr(hl_id) : 0; int attr_id = hl_id > 0 ? syn_id2attr(hl_id) : 0;