[vim/vim] fix(highlight): pum matched text respect icase (PR #15023)
glepnir
Problem:
- STRNCMP does not respect the upper case when icase is set of complete item.
- ins_compl_stop will free all leader even bs just delete the one leader.
Solution:
1.use MB_STRNICMP instead
2. when compl_leader is null use compl_orig_text for match.
Fix #15021
You can view, comment on, or merge this pull request online at:
https://github.com/vim/vim/pull/15023
Commit Summary
- f9eeaa3 fix(highlight): pum matched text respect icase
File Changes
(4 files)
- M src/insexpand.c (2)
- M src/popupmenu.c (2)
- A src/testdir/dumps/Test_pum_highlights_08.dump (20)
- M src/testdir/test_popup.vim (12)
Patch Links:
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
glepnir
@glepnir pushed 1 commit.
- 4172d16 fix(highlight): pum matched text respect icase
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
zeertzjq
@zeertzjq commented on this pull request.
In src/popupmenu.c:
> @@ -485,7 +485,7 @@ pum_screen_put_with_attr(int row, int col, char_u *text, int textlen, hlf_T hlf) } } else if (!in_fuzzy && (ptr - text < leader_len) - && (STRNCMP(text, match_leader, leader_len) == 0)) + && (MB_STRNICMP(text, match_leader, leader_len) == 0))
This function is called repeatedly when it only needs to be called once. Maybe you can rebase this onto #15020.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
zeertzjq
@zeertzjq commented on this pull request.
In src/insexpand.c:
> @@ -1448,7 +1448,7 @@ ins_compl_show_pum(void)
char_u *
ins_compl_leader(void)
{
- return compl_leader;
+ return compl_leader != NULL ? compl_leader : compl_orig_text;
Is this change tested?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
glepnir
@glepnir commented on this pull request.
In src/insexpand.c:
> @@ -1448,7 +1448,7 @@ ins_compl_show_pum(void)
char_u *
ins_compl_leader(void)
{
- return compl_leader;
+ return compl_leader != NULL ? compl_leader : compl_orig_text;
missed. should add a bs step.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
glepnir
@glepnir commented on this pull request.
In src/popupmenu.c:
> @@ -485,7 +485,7 @@ pum_screen_put_with_attr(int row, int col, char_u *text, int textlen, hlf_T hlf) } } else if (!in_fuzzy && (ptr - text < leader_len) - && (STRNCMP(text, match_leader, leader_len) == 0)) + && (MB_STRNICMP(text, match_leader, leader_len) == 0))
oh nice. i will wait that.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
glepnir
@glepnir commented on this pull request.
In src/popupmenu.c:
> @@ -485,7 +485,7 @@ pum_screen_put_with_attr(int row, int col, char_u *text, int textlen, hlf_T hlf) } } else if (!in_fuzzy && (ptr - text < leader_len) - && (STRNCMP(text, match_leader, leader_len) == 0)) + && (MB_STRNICMP(text, match_leader, leader_len) == 0))
mark as draft then.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Christian Brabandt
@chrisbra commented on this pull request.
In src/popupmenu.c:
> @@ -485,7 +485,7 @@ pum_screen_put_with_attr(int row, int col, char_u *text, int textlen, hlf_T hlf) } } else if (!in_fuzzy && (ptr - text < leader_len) - && (STRNCMP(text, match_leader, leader_len) == 0)) + && (MB_STRNICMP(text, match_leader, leader_len) == 0))
I have merged it.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
zeertzjq
I force-pushed to your branch to rebase this PR. It also seems that the two screen dumps add in this PR are the same, so I combined them into one.
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
glepnir
it's fine :)
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
Christian Brabandt
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.