diff options
| author | bfredl <bjorn.linse@gmail.com> | 2023-11-08 12:17:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-08 12:17:25 +0100 |
| commit | 1b0fd377aba3b4d076e4dbfb5adb96866a4982d1 (patch) | |
| tree | 460bbeada52d9b7bd3a1ad194224cec461f7f055 /src/nvim/marktree.c | |
| parent | 4c8fdc018b428c4b5f35215a1189d2cd55cd5888 (diff) | |
| parent | 4e6f559b8c5f77924fdbe2e5abd9c6aa8efad13f (diff) | |
| download | rneovim-1b0fd377aba3b4d076e4dbfb5adb96866a4982d1.tar.gz rneovim-1b0fd377aba3b4d076e4dbfb5adb96866a4982d1.tar.bz2 rneovim-1b0fd377aba3b4d076e4dbfb5adb96866a4982d1.zip | |
Merge pull request #25767 from luukvbaal/signdel
feat(extmarks): add 'invalidate' property
Diffstat (limited to 'src/nvim/marktree.c')
| -rw-r--r-- | src/nvim/marktree.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/nvim/marktree.c b/src/nvim/marktree.c index 3df659b8e1..214d228b2c 100644 --- a/src/nvim/marktree.c +++ b/src/nvim/marktree.c @@ -1146,9 +1146,14 @@ void marktree_revise(MarkTree *b, MarkTreeIter *itr, uint8_t decor_level, MTKey // TODO(bfredl): clean up this mess and re-instantiate &= and |= forms // once we upgrade to a non-broken version of gcc in functionaltest-lua CI rawkey(itr).flags = (uint16_t)(rawkey(itr).flags & (uint16_t) ~MT_FLAG_DECOR_MASK); + rawkey(itr).flags = (uint16_t)(rawkey(itr).flags & (uint16_t) ~MT_FLAG_INVALID); rawkey(itr).flags = (uint16_t)(rawkey(itr).flags | (uint16_t)(decor_level << MT_FLAG_DECOR_OFFSET) - | (uint16_t)(key.flags & MT_FLAG_DECOR_MASK)); + | (uint16_t)(key.flags & MT_FLAG_DECOR_MASK) + | (uint16_t)(key.flags & MT_FLAG_HL_EOL) + | (uint16_t)(key.flags & MT_FLAG_NO_UNDO) + | (uint16_t)(key.flags & MT_FLAG_INVALID) + | (uint16_t)(key.flags & MT_FLAG_INVALIDATE)); rawkey(itr).decor_full = key.decor_full; rawkey(itr).hl_id = key.hl_id; rawkey(itr).priority = key.priority; @@ -2006,8 +2011,8 @@ static void marktree_itr_fix_pos(MarkTree *b, MarkTreeIter *itr) void marktree_put_test(MarkTree *b, uint32_t ns, uint32_t id, int row, int col, bool right_gravity, int end_row, int end_col, bool end_right) { - MTKey key = { { row, col }, ns, id, 0, - mt_flags(right_gravity, 0, false), 0, NULL }; + uint16_t flags = mt_flags(right_gravity, false, false, false, 0); + MTKey key = { { row, col }, ns, id, 0, flags, 0, NULL }; marktree_put(b, key, end_row, end_col, end_right); } |