OSDN > 軟體搜索 > Vim > SCM > hg > vim > 提交

Vim
Fork

vim: 提交

Mirror of the Vim source from https://github.com/vim/vim

patch 8.2.1921: fuzzy matching does not recognize path separators

Commit: https://github.com/vim/vim/commit/dcdd42a8ccb9bafd857735d694b074269f337333
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 29 18:58:01 2020 +0100

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 #7225)

diff -r 34e09ca2ddb7 -r 875bd7c04533 src/search.c

--- a/src/search.c Wed Oct 28 23:00:05 2020 +0100

+++ b/src/search.c Thu Oct 29 19:00:04 2020 +0100

		@@ -4258,8 +4258,10 @@
4258	4258	// bonus for adjacent matches; this is higher than SEPARATOR_BONUS so that
4259	4259	// matching a whole word is preferred.
4260	4260	#define SEQUENTIAL_BONUS 40
4261		-// bonus if match occurs after a separator
4262		-#define SEPARATOR_BONUS 30
	4261	+// bonus if match occurs after a path separator
	4262	+#define PATH_SEPARATOR_BONUS 30
	4263	+// bonus if match occurs after a word separator
	4264	+#define WORD_SEPARATOR_BONUS 25
4263	4265	// bonus if match is uppercase and prev is lower
4264	4266	#define CAMEL_BONUS 30
4265	4267	// bonus if the first letter is matched

		@@ -4355,10 +4356,11 @@
4355	4356	if (vim_islower(neighbor) && vim_isupper(curr))
4356	4357	score += CAMEL_BONUS;
4357	4358
4358		- // Separator
4359		- neighborSeparator = neighbor == '_' \|\| neighbor == ' ';
4360		- if (neighborSeparator)
4361		- score += SEPARATOR_BONUS;
	4359	+ // Bonus if the match follows a separator character
	4360	+ if (neighbor == '/' \|\| neighbor == '\\')
	4361	+ score += PATH_SEPARATOR_BONUS;
	4362	+ else if (neighbor == ' ' \|\| neighbor == '_')
	4363	+ score += WORD_SEPARATOR_BONUS;
4362	4364	}
4363	4365	else
4364	4366	{

diff -r 34e09ca2ddb7 -r 875bd7c04533 src/testdir/test_matchfuzzy.vim

--- a/src/testdir/test_matchfuzzy.vim Wed Oct 28 23:00:05 2020 +0100

+++ b/src/testdir/test_matchfuzzy.vim Thu Oct 29 19:00:04 2020 +0100

		@@ -43,6 +43,8 @@
43	43	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'))
44	44	" gap penalty
45	45	call assert_equal(['xxayybxxxx', 'xxayyybxxx', 'xxayyyybxx'], ['xxayyyybxx', 'xxayyybxxx', 'xxayybxxxx']->matchfuzzy('ab'))
	46	+ " path separator vs word separator
	47	+ 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'))
46	48
47	49	" match multiple words (separated by space)
48	50	call assert_equal(['foo bar baz'], ['foo bar baz', 'foo', 'foo bar', 'baz bar']->matchfuzzy('baz foo'))

diff -r 34e09ca2ddb7 -r 875bd7c04533 src/version.c

--- a/src/version.c Wed Oct 28 23:00:05 2020 +0100

+++ b/src/version.c Thu Oct 29 19:00:04 2020 +0100

		@@ -751,6 +751,8 @@
751	751	static int included_patches[] =
752	752	{ /* Add new patch number below this line */
753	753	/**/
	754	+ 1921,
	755	+/**/
754	756	1920,
755	757	/**/
756	758	1919,