mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-14 05:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25186 from llllvvuu/fix/preserve_marktree_orderinh

Browse Source 
fix(marktree): preserve ordering in `marktree_move`
This commit is contained in:
bfredl
2023-09-16 14:59:20 +02:00
committed by GitHub
parent 07080f67fe 477458f7bf
commit 883e2a1409
2 changed files with 110 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/marktree.c
View File

@@ -1178,6 +1178,9 @@ void marktree_move(MarkTree *b, MarkTreeIter *itr, int row, int col)
}
if (internal) {
if (key.pos.row == newpos.row && key.pos.col == newpos.col) {
return;
}
key.pos = newpos;
bool match;
// tricky: could minimize movement in either direction better
@@ -1185,7 +1188,7 @@ void marktree_move(MarkTree *b, MarkTreeIter *itr, int row, int col)
if (!match) {
new_i++;
}
if (new_i == itr->i || key_cmp(key, x->key[new_i]) == 0) {
if (new_i == itr->i) {
x->key[itr->i].pos = newpos;
} else if (new_i < itr->i) {
memmove(&x->key[new_i + 1], &x->key[new_i], sizeof(MTKey) * (size_t)(itr->i - new_i));