diff options
| author | Lewis Russell <lewis6991@gmail.com> | 2022-08-11 17:26:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-11 17:26:17 +0100 |
| commit | a27756cc2463139343aa3c214ad20908d42f67a6 (patch) | |
| tree | 8e5c1e8b53a41b5456bf15bf2f5e494cb16897c4 | |
| parent | 996fc2256bafabeb8f5806d70d531311a34d29f9 (diff) | |
| download | rneovim-a27756cc2463139343aa3c214ad20908d42f67a6.tar.gz rneovim-a27756cc2463139343aa3c214ad20908d42f67a6.tar.bz2 rneovim-a27756cc2463139343aa3c214ad20908d42f67a6.zip | |
fix(signs): priority of extmark signs (#19718)
| -rw-r--r-- | runtime/doc/api.txt | 5 | ||||
| -rw-r--r-- | src/nvim/api/extmark.c | 5 | ||||
| -rw-r--r-- | src/nvim/decoration.c | 2 | ||||
| -rw-r--r-- | test/functional/ui/decorations_spec.lua | 30 |
4 files changed, 36 insertions, 6 deletions
diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt index c76a8271e0..12edaa1f08 100644 --- a/runtime/doc/api.txt +++ b/runtime/doc/api.txt @@ -2610,8 +2610,9 @@ nvim_buf_set_extmark({buffer}, {ns_id}, {line}, {col}, {*opts}) the extmark end position (if it exists) will be shifted in when new text is inserted (true for right, false for left). Defaults to false. - • priority: a priority value for the highlight group. For - example treesitter highlighting uses a value of 100. + • priority: a priority value for the highlight group or sign + attribute. For example treesitter highlighting uses a + value of 100. • strict: boolean that indicates extmark should not be placed if the line or column value is past the end of the buffer or end of the line respectively. Defaults to true. diff --git a/src/nvim/api/extmark.c b/src/nvim/api/extmark.c index da1b6beeda..c36f127507 100644 --- a/src/nvim/api/extmark.c +++ b/src/nvim/api/extmark.c @@ -441,8 +441,9 @@ Array nvim_buf_get_extmarks(Buffer buffer, Integer ns_id, Object start, Object e /// the extmark end position (if it exists) will be shifted /// in when new text is inserted (true for right, false /// for left). Defaults to false. -/// - priority: a priority value for the highlight group. For -/// example treesitter highlighting uses a value of 100. +/// - priority: a priority value for the highlight group or sign +/// attribute. For example treesitter highlighting uses a +/// value of 100. /// - strict: boolean that indicates extmark should not be placed /// if the line or column value is past the end of the /// buffer or end of the line respectively. Defaults to true. diff --git a/src/nvim/decoration.c b/src/nvim/decoration.c index 6f946bb41a..8258f2afd5 100644 --- a/src/nvim/decoration.c +++ b/src/nvim/decoration.c @@ -385,7 +385,7 @@ void decor_redraw_signs(buf_T *buf, int row, int *num_signs, sign_attrs_T sattrs int j; for (j = (*num_signs); j > 0; j--) { - if (sattrs[j].sat_prio <= decor->priority) { + if (sattrs[j - 1].sat_prio >= decor->priority) { break; } sattrs[j] = sattrs[j - 1]; diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua index 9af5d386db..68eebaf3a2 100644 --- a/test/functional/ui/decorations_spec.lua +++ b/test/functional/ui/decorations_spec.lua @@ -1681,7 +1681,7 @@ l5 screen:expect{grid=[[ S4S1^l1 | - S2x l2 | + x S2l2 | S5{1: }l3 | {1: }l4 | {1: }l5 | @@ -1779,6 +1779,34 @@ l5 ]]} end) + it('works with priority #19716', function() + screen:try_resize(20, 3) + insert(example_text) + feed 'gg' + + helpers.command('sign define Oldsign text=O3') + helpers.command([[exe 'sign place 42 line=1 name=Oldsign priority=10 buffer=' . bufnr('')]]) + + meths.buf_set_extmark(0, ns, 0, -1, {sign_text='S4', priority=100}) + meths.buf_set_extmark(0, ns, 0, -1, {sign_text='S2', priority=5}) + meths.buf_set_extmark(0, ns, 0, -1, {sign_text='S5', priority=200}) + meths.buf_set_extmark(0, ns, 0, -1, {sign_text='S1', priority=1}) + + screen:expect{grid=[[ + S1S2O3S4S5^l1 | + {1: }l2 | + | + ]]} + + -- Check truncation works too + meths.win_set_option(0, 'signcolumn', 'auto') + + screen:expect{grid=[[ + S5^l1 | + {1: }l2 | + | + ]]} + end) end) describe('decorations: virt_text', function() |