mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-26 13:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address review r3

Browse Source
This commit is contained in:
Michael Lingelbach
2022-01-15 08:37:44 -08:00
parent 2fd8330628
commit facd07bcf7
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/api/extmark.c
View File

@@ -445,9 +445,18 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id, Integer line, Integer
opts->end_row = opts->end_line; opts->end_row = opts->end_line;
} }
#define OPTION_TO_BOOL(target, name, val) \
target = api_object_to_bool(opts->name, #name, val, err); \
if (ERROR_SET(err)) { \
goto error; \
}
bool strict = true;
OPTION_TO_BOOL(strict, strict, true);
if (opts->end_row.type == kObjectTypeInteger) { if (opts->end_row.type == kObjectTypeInteger) {
Integer val = opts->end_row.data.integer; Integer val = opts->end_row.data.integer;
if (val < 0 || val > buf->b_ml.ml_line_count) { if (val < 0 || (val > buf->b_ml.ml_line_count && strict)) {
api_set_error(err, kErrorTypeValidation, "end_row value outside range"); api_set_error(err, kErrorTypeValidation, "end_row value outside range");
goto error; goto error;
} else { } else {
@@ -516,12 +525,6 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id, Integer line, Integer
goto error; goto error;
} }
#define OPTION_TO_BOOL(target, name, val) \
target = api_object_to_bool(opts->name, #name, val, err); \
if (ERROR_SET(err)) { \
goto error; \
}
OPTION_TO_BOOL(decor.virt_text_hide, virt_text_hide, false); OPTION_TO_BOOL(decor.virt_text_hide, virt_text_hide, false);
OPTION_TO_BOOL(decor.hl_eol, hl_eol, false); OPTION_TO_BOOL(decor.hl_eol, hl_eol, false);
@@ -600,9 +603,6 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id, Integer line, Integer
bool ephemeral = false; bool ephemeral = false;
OPTION_TO_BOOL(ephemeral, ephemeral, false); OPTION_TO_BOOL(ephemeral, ephemeral, false);
bool strict = true;
OPTION_TO_BOOL(strict, strict, true);
if (line < 0) { if (line < 0) {
api_set_error(err, kErrorTypeValidation, "line value outside range"); api_set_error(err, kErrorTypeValidation, "line value outside range");
goto error; goto error;

16
test/functional/api/extmark_spec.lua
View File

@@ -110,6 +110,22 @@ describe('API/extmarks', function()
pcall_err(set_extmark, ns, marks[2], 0, 0, { end_col = 1, end_row = 1 })) pcall_err(set_extmark, ns, marks[2], 0, 0, { end_col = 1, end_row = 1 }))
end) end)
it("can end extranges past final newline when strict mode is false", function()
set_extmark(ns, marks[1], 0, 0, {
end_col = 1,
end_row = 1,
strict = false
})
end)
it("can end extranges past final column when strict mode is false", function()
set_extmark(ns, marks[1], 0, 0, {
end_col = 1,
end_row = 6,
strict = false
})
end)
it('adds, updates and deletes marks', function() it('adds, updates and deletes marks', function()
local rv = set_extmark(ns, marks[1], positions[1][1], positions[1][2]) local rv = set_extmark(ns, marks[1], positions[1][1], positions[1][2])
eq(marks[1], rv) eq(marks[1], rv)