diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2022-01-01 22:35:43 +0000 |
|---|---|---|
| committer | Sean Dewar <seandewar@users.noreply.github.com> | 2022-02-07 17:20:50 +0000 |
| commit | 712c7e5d5fe8fbd93e47b8064a24ff9346720402 (patch) | |
| tree | 4641ad9cb4dca6cc9a334d03e6451b804fa668f7 | |
| parent | 30deb14f397e576aedfa54600ed7408b3e03459d (diff) | |
| download | rneovim-712c7e5d5fe8fbd93e47b8064a24ff9346720402.tar.gz rneovim-712c7e5d5fe8fbd93e47b8064a24ff9346720402.tar.bz2 rneovim-712c7e5d5fe8fbd93e47b8064a24ff9346720402.zip | |
vim-patch:8.2.1921: fuzzy matching does not recognize path separators
Problem: Fuzzy matching does not recognize path separators.
Solution: Add a bonus for slash and backslash. (Yegappan Lakshmanan,
closes vim/vim#7225)
https://github.com/vim/vim/commit/dcdd42a8ccb9bafd857735d694b074269f337333
| -rw-r--r-- | src/nvim/search.c | 15 | ||||
| -rw-r--r-- | src/nvim/testdir/test_matchfuzzy.vim | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/nvim/search.c b/src/nvim/search.c index a021466446..b08de3177e 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -4823,8 +4823,10 @@ typedef struct { /// bonus for adjacent matches; this is higher than SEPARATOR_BONUS so that /// matching a whole word is preferred. #define SEQUENTIAL_BONUS 40 -/// bonus if match occurs after a separator -#define SEPARATOR_BONUS 30 +/// bonus if match occurs after a path separator +#define PATH_SEPARATOR_BONUS 30 +/// bonus if match occurs after a word separator +#define WORD_SEPARATOR_BONUS 25 /// bonus if match is uppercase and prev is lower #define CAMEL_BONUS 30 /// bonus if the first letter is matched @@ -4895,10 +4897,11 @@ static int fuzzy_match_compute_score(const char_u *const str, const int strSz, score += CAMEL_BONUS; } - // Separator - const bool neighborSeparator = neighbor == '_' || neighbor == ' '; - if (neighborSeparator) { - score += SEPARATOR_BONUS; + // Bonus if the match follows a separator character + if (neighbor == '/' || neighbor == '\\') { + score += PATH_SEPARATOR_BONUS; + } else if (neighbor == ' ' || neighbor == '_') { + score += WORD_SEPARATOR_BONUS; } } else { // First letter diff --git a/src/nvim/testdir/test_matchfuzzy.vim b/src/nvim/testdir/test_matchfuzzy.vim index 28367b878d..d67d9bd893 100644 --- a/src/nvim/testdir/test_matchfuzzy.vim +++ b/src/nvim/testdir/test_matchfuzzy.vim @@ -45,6 +45,8 @@ func Test_matchfuzzy() call assert_equal(['.vim/vimrc', '.vim/vimrc_colors', '.vim/v_i_m_r_c'], ['.vim/vimrc', '.vim/vimrc_colors', '.vim/v_i_m_r_c']->matchfuzzy('vimrc')) " gap penalty call assert_equal(['xxayybxxxx', 'xxayyybxxx', 'xxayyyybxx'], ['xxayyyybxx', 'xxayyybxxx', 'xxayybxxxx']->matchfuzzy('ab')) + " path separator vs word separator + call assert_equal(['color/setup.vim', 'color\\setup.vim', 'color setup.vim', 'color_setup.vim', 'colorsetup.vim'], matchfuzzy(['colorsetup.vim', 'color setup.vim', 'color/setup.vim', 'color_setup.vim', 'color\\setup.vim'], 'setup.vim')) " match multiple words (separated by space) call assert_equal(['foo bar baz'], ['foo bar baz', 'foo', 'foo bar', 'baz bar']->matchfuzzy('baz foo')) |