mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-21 14:55:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(prompt_buffer): plugins can't set ': mark #35624

Browse Source 
Problem:
Currently, prompt_buffer manages `:` mark by itself and exposes it
read-only mark. However when it fails there can be no mitigation made
by plugins. The `:` mark should act like a regular marks and be
modifiable.

Solution:
Allow plugins to set `:` mark.
This commit is contained in:
Shadman
2025-09-09 04:09:48 +06:00
committed by GitHub
parent 1cb1cfead0
commit acb99b8a65
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/mark.c
View File

@@ -146,6 +146,11 @@ int setmark_pos(int c, pos_T *pos, int fnum, fmarkv_T *view_pt)
return OK; return OK;
} }
if (c == ':' && bt_prompt(buf)) {
RESET_FMARK(&buf->b_prompt_start, *pos, buf->b_fnum, view);
return OK;
}
if (ASCII_ISLOWER(c)) { if (ASCII_ISLOWER(c)) {
i = c - 'a'; i = c - 'a';
RESET_FMARK(buf->b_namedm + i, *pos, fnum, view); RESET_FMARK(buf->b_namedm + i, *pos, fnum, view);
@@ -1720,8 +1725,7 @@ bool mark_set_local(const char name, buf_T *const buf, const fmark_T fm, const b
} else if (name == '^') { } else if (name == '^') {
fm_tgt = &(buf->b_last_insert); fm_tgt = &(buf->b_last_insert);
} else if (name == ':') { } else if (name == ':') {
// Readonly mark for prompt buffer. Can't be edited on user side. fm_tgt = &(buf->b_prompt_start);
return false;
} else if (name == '.') { } else if (name == '.') {
fm_tgt = &(buf->b_last_change); fm_tgt = &(buf->b_last_change);
} else { } else {

6
test/functional/legacy/prompt_buffer_spec.lua
View File

@@ -622,6 +622,12 @@ describe('prompt buffer', function()
-- ': mark is only available in prompt buffer. -- ': mark is only available in prompt buffer.
source('set buftype=') source('set buftype=')
eq("Invalid mark name: ':'", t.pcall_err(api.nvim_buf_get_mark, 0, ':')) eq("Invalid mark name: ':'", t.pcall_err(api.nvim_buf_get_mark, 0, ':'))
-- mark can be moved
source('set buftype=prompt')
eq({ 11, 1 }, api.nvim_buf_get_mark(0, ':'))
eq(true, api.nvim_buf_set_mark(0, ':', 1, 1, {}))
eq({ 1, 1 }, api.nvim_buf_get_mark(0, ':'))
end) end)
describe('prompt_getinput', function() describe('prompt_getinput', function()