mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-03-30 04:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): auto-load buffers in nvim_buf_set_* operations (#35046)

Browse Source 
fix(api): auto-load buffers in nvim_buf_set_* operations

Problem: Setting marks, lines, or text on unloaded buffers fails because
ml_line_count is not accurate until the buffer is loaded.

Solution: Add require_loaded_buffer() helper and use it in write operations
(nvim_buf_set_lines, nvim_buf_set_text, nvim_buf_set_mark). These now
auto-load buffers as needed.
This commit is contained in:
glepnir
2026-01-21 14:17:44 +08:00
committed by GitHub
parent 2c2203c040
commit c556972ae1
2 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,6 +288,22 @@ ArrayOf(String) nvim_buf_get_lines(uint64_t channel_id,
return rv;
}
static buf_T *require_loaded_buffer(Buffer buffer, Error *err)
{
buf_T *buf = find_buffer_by_handle(buffer, err);
if (!buf) {
return NULL;
}
// Load buffer if necessary
if (buf->b_ml.ml_mfp == NULL && !buf_ensure_loaded(buf)) {
api_set_error(err, kErrorTypeException, "Failed to load buffer");
return NULL;
}
return buf;
}
/// Sets (replaces) a line-range in the buffer.
///
/// Indexing is zero-based, end-exclusive. Negative indices are interpreted
@@ -315,18 +331,12 @@ void nvim_buf_set_lines(uint64_t channel_id, Buffer buffer, Integer start, Integ
FUNC_API_SINCE(1)
FUNC_API_TEXTLOCK_ALLOW_CMDWIN
{
buf_T *buf = find_buffer_by_handle(buffer, err);
buf_T *buf = require_loaded_buffer(buffer, err);
if (!buf) {
return;
}
// Load buffer if necessary. #22670
if (!buf_ensure_loaded(buf)) {
api_set_error(err, kErrorTypeException, "Failed to load buffer");
return;
}
bool oob = false;
start = normalize_index(buf, start, true, &oob);
end = normalize_index(buf, end, true, &oob);
@@ -480,17 +490,11 @@ void nvim_buf_set_text(uint64_t channel_id, Buffer buffer, Integer start_row, In
replacement = scratch;
}
buf_T *buf = find_buffer_by_handle(buffer, err);
buf_T *buf = require_loaded_buffer(buffer, err);
if (!buf) {
return;
}
// Load buffer if necessary. #22670
if (!buf_ensure_loaded(buf)) {
api_set_error(err, kErrorTypeException, "Failed to load buffer");
return;
}
bool oob = false;
// check range is ordered and everything!
@@ -1112,7 +1116,7 @@ Boolean nvim_buf_set_mark(Buffer buffer, String name, Integer line, Integer col,
FUNC_API_SINCE(8)
{
bool res = false;
buf_T *buf = find_buffer_by_handle(buffer, err);
buf_T *buf = require_loaded_buffer(buffer, err);
if (!buf) {
return res;