kyle/kte
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preserve cursor position on buffer reload.

Browse Source 
- Remember and restore the cursor's position after reloading a buffer, clamping if necessary.
- Improve user experience by maintaining editing context.
This commit is contained in:
Kyle Isom
2025-12-07 15:25:40 -08:00
parent c9f34003f2
commit e1f9a9eb6a
1 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Command.cc
View File

@@ -4224,22 +4224,38 @@ cmd_reflow_paragraph(CommandContext &ctx)
static bool static bool
cmd_reload_buffer(CommandContext &ctx) cmd_reload_buffer(CommandContext &ctx)
{ {
Buffer *buf = ctx.editor.CurrentBuffer(); Buffer *buf = ctx.editor.CurrentBuffer();
if (!buf) if (!buf)
return false; return false;
const std::string &filename = buf->Filename(); // Remember the current cursor position so we can attempt to restore it
if (filename.empty()) { const std::size_t old_x = buf->Curx();
ctx.editor.SetStatus("Cannot reload unnamed buffer"); const std::size_t old_y = buf->Cury();
return false; const std::string &filename = buf->Filename();
} if (filename.empty()) {
std::string err; ctx.editor.SetStatus("Cannot reload unnamed buffer");
if (!buf->OpenFromFile(filename, err)) { return false;
ctx.editor.SetStatus(std::string("Reload failed: ") + err); }
return false; std::string err;
} if (!buf->OpenFromFile(filename, err)) {
ctx.editor.SetStatus(std::string("Reloaded ") + filename); ctx.editor.SetStatus(std::string("Reload failed: ") + err);
ensure_cursor_visible(ctx.editor, *buf); return false;
return true; }
// Try to restore the cursor to its previous position if still valid; otherwise clamp
{
auto &rows = buf->Rows();
const std::size_t nrows = rows.size();
if (nrows == 0) {
buf->SetCursor(0, 0);
} else {
const std::size_t new_y = old_y < nrows ? old_y : (nrows - 1);
const std::size_t line_len = rows[new_y].size();
const std::size_t new_x = old_x < line_len ? old_x : line_len;
buf->SetCursor(new_x, new_y);
}
}
ctx.editor.SetStatus(std::string("Reloaded ") + filename);
ensure_cursor_visible(ctx.editor, *buf);
return true;
} }