IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13255 from janlazo/pvs-547-560

Browse Source 
pvs: fix v547, v560 errors
This commit is contained in:
Jan Edmund Lazo 2020-11-08 20:34:01 -05:00 committed by GitHub
commit 94062831b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/api/vim.c
View File

@ -805,7 +805,7 @@ ArrayOf(String) nvim_get_runtime_file(String name, Boolean all, Error *err)
} }
int flags = DIP_START | (all ? DIP_ALL : 0); int flags = DIP_START | (all ? DIP_ALL : 0);
do_in_runtimepath(name.size ? (char_u *)name.data : NULL, do_in_runtimepath((char_u *)name.data,
flags, find_runtime_cb, &rv); flags, find_runtime_cb, &rv);
return rv; return rv;
} }

4
src/nvim/decoration.c
View File

@ -182,7 +182,7 @@ bool decor_redraw_start(buf_T *buf, int top_row, DecorState *state)
Decoration *decor = item->decor; Decoration *decor = item->decor;
if ((!(mark.id&MARKTREE_END_FLAG) && altpos.row < top_row if ((!(mark.id&MARKTREE_END_FLAG) && altpos.row < top_row
&& item && !kv_size(decor->virt_text)) && !kv_size(decor->virt_text))
|| ((mark.id&MARKTREE_END_FLAG) && altpos.row >= top_row)) { || ((mark.id&MARKTREE_END_FLAG) && altpos.row >= top_row)) {
goto next_mark; goto next_mark;
} }
@ -251,7 +251,7 @@ int decor_redraw_col(buf_T *buf, int col, DecorState *state)
if (endpos.row < mark.row if (endpos.row < mark.row
|| (endpos.row == mark.row && endpos.col <= mark.col)) { || (endpos.row == mark.row && endpos.col <= mark.col)) {
if (item && !kv_size(decor->virt_text)) { if (!kv_size(decor->virt_text)) {
goto next_mark; goto next_mark;
} }
} }

66
src/nvim/marktree.c
View File

@ -326,38 +326,37 @@ void marktree_del_itr(MarkTree *b, MarkTreeIter *itr, bool rev)
x->n--; x->n--;
// 4. // 4.
if (adjustment) { // if (adjustment == 1) {
if (adjustment == 1) { // abort();
abort(); // }
} else { // adjustment == -1 if (adjustment == -1) {
int ilvl = itr->lvl-1; int ilvl = itr->lvl-1;
mtnode_t *lnode = x; const mtnode_t *lnode = x;
do { do {
mtnode_t *p = lnode->parent; const mtnode_t *const p = lnode->parent;
if (ilvl < 0) { if (ilvl < 0) {
abort(); abort();
} }
int i = itr->s[ilvl].i; const int i = itr->s[ilvl].i;
assert(p->ptr[i] == lnode); assert(p->ptr[i] == lnode);
if (i > 0) { if (i > 0) {
unrelative(p->key[i-1].pos, &intkey.pos); unrelative(p->key[i-1].pos, &intkey.pos);
} }
lnode = p; lnode = p;
ilvl--; ilvl--;
} while (lnode != cur); } while (lnode != cur);
mtkey_t deleted = cur->key[curi]; mtkey_t deleted = cur->key[curi];
cur->key[curi] = intkey; cur->key[curi] = intkey;
refkey(b, cur, curi); refkey(b, cur, curi);
relative(intkey.pos, &deleted.pos); relative(intkey.pos, &deleted.pos);
mtnode_t *y = cur->ptr[curi+1]; mtnode_t *y = cur->ptr[curi+1];
if (deleted.pos.row || deleted.pos.col) { if (deleted.pos.row || deleted.pos.col) {
while (y) { while (y) {
for (int k = 0; k < y->n; k++) { for (int k = 0; k < y->n; k++) {
unrelative(deleted.pos, &y->key[k].pos); unrelative(deleted.pos, &y->key[k].pos);
}
y = y->level ? y->ptr[0] : NULL;
} }
y = y->level ? y->ptr[0] : NULL;
} }
} }
} }
@ -435,9 +434,10 @@ void marktree_del_itr(MarkTree *b, MarkTreeIter *itr, bool rev)
// BONUS STEP: fix the iterator, so that it points to the key afterwards // BONUS STEP: fix the iterator, so that it points to the key afterwards
// TODO(bfredl): with "rev" should point before // TODO(bfredl): with "rev" should point before
if (adjustment == 1) { // if (adjustment == 1) {
abort(); // abort();
} else if (adjustment == -1) { // }
if (adjustment == -1) {
// tricky: we stand at the deleted space in the previous leaf node. // tricky: we stand at the deleted space in the previous leaf node.
// But the inner key is now the previous key we stole, so we need // But the inner key is now the previous key we stole, so we need
// to skip that one as well. // to skip that one as well.