IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.1835: ":help ??" finds the "!!" tag (#18350)

Browse Source 
* vim-patch:8.2.1835: ":help ??" finds the "!!" tag

Problem:    ":help ??" finds the "!!" tag.
Solution:   Do not translate "?" into ".".  (Naruhiko Nishino, closes vim/vim#7114,
            closes vim/vim#7115)
6eb36ade98

Change test because patch 8.2.1794 hasn't been ported yet.
This commit is contained in:
dundargoc 2022-05-02 11:01:40 +02:00 committed by GitHub
parent 1e970c003f
commit 327a6d885c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 66 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/nvim/ex_cmds.c
View File

@ -5023,37 +5023,59 @@ static int help_compare(const void *s1, const void *s2)
int find_help_tags(const char *arg, int *num_matches, char ***matches, bool keep_lang)
{
int i;
static const char *(mtable[]) = {
"*", "g*", "[*", "]*",
"/*", "/\\*", "\"*", "**",
"/\\(\\)", "/\\%(\\)",
"?", ":?", "?<CR>", "g?", "g?g?", "g??",
"-?", "q?", "v_g?",
"/\\?", "/\\z(\\)", "\\=", ":s\\=",
"[count]", "[quotex]",
"[range]", ":[range]",
"[pattern]", "\\|", "\\%$",
"s/\\~", "s/\\U", "s/\\L",
"s/\\1", "s/\\2", "s/\\3", "s/\\9"
};
static const char *(rtable[]) = {
"star", "gstar", "[star", "]star",
"/star", "/\\\\star", "quotestar", "starstar",
"/\\\\(\\\\)", "/\\\\%(\\\\)",
"?", ":?", "?<CR>", "g?", "g?g?", "g??",
"-?", "q?", "v_g?",
"/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
"\\[count]", "\\[quotex]",
"\\[range]", ":\\[range]",
"\\[pattern]", "\\\\bar", "/\\\\%\\$",
"s/\\\\\\~", "s/\\\\U", "s/\\\\L",
"s/\\\\1", "s/\\\\2", "s/\\\\3", "s/\\\\9"
// Specific tags that either have a specific replacement or won't go
// throught the generic rules.
static char *(except_tbl[][2]) = {
{ "*", "star" },
{ "g*", "gstar" },
{ "[*", "[star" },
{ "]*", "]star" },
{ ":*", ":star" },
{ "/*", "/star" }, // NOLINT
{ "/\\*", "/\\\\star" },
{ "\"*", "quotestar" },
{ "**", "starstar" },
{ "cpo-*", "cpo-star" },
{ "/\\(\\)", "/\\\\(\\\\)" },
{ "/\\%(\\)", "/\\\\%(\\\\)" },
{ "?", "?" },
{ "??", "??" },
{ ":?", ":?" },
{ "?<CR>", "?<CR>" },
{ "g?", "g?" },
{ "g?g?", "g?g?" },
{ "g??", "g??" },
{ "-?", "-?" },
{ "q?", "q?" },
{ "v_g?", "v_g?" },
{ "/\\?", "/\\\\?" },
{ "/\\z(\\)", "/\\\\z(\\\\)" },
{ "\\=", "\\\\=" },
{ ":s\\=", ":s\\\\=" },
{ "[count]", "\\[count]" },
{ "[quotex]", "\\[quotex]" },
{ "[range]", "\\[range]" },
{ ":[range]", ":\\[range]" },
{ "[pattern]", "\\[pattern]" },
{ "\\|", "\\\\bar" },
{ "\\%$", "/\\\\%\\$" },
{ "s/\\~", "s/\\\\\\~" },
{ "s/\\U", "s/\\\\U" },
{ "s/\\L", "s/\\\\L" },
{ "s/\\1", "s/\\\\1" },
{ "s/\\2", "s/\\\\2" },
{ "s/\\3", "s/\\\\3" },
{ "s/\\9", "s/\\\\9" },
{ NULL, NULL }
};
static const char *(expr_table[]) = {
"!=?", "!~?", "<=?", "<?", "==?", "=~?",
">=?", ">?", "is?", "isnot?"
};
char *d = (char *)IObuff; // assume IObuff is long enough!
d[0] = NUL;
if (STRNICMP(arg, "expr-", 5) == 0) {
// When the string starting with "expr-" and containing '?' and matches
@ -5075,16 +5097,16 @@ int find_help_tags(const char *arg, int *num_matches, char ***matches, bool keep
}
} else {
// Recognize a few exceptions to the rule. Some strings that contain
// '*' with "star". Otherwise '*' is recognized as a wildcard.
for (i = (int)ARRAY_SIZE(mtable); --i >= 0;) {
if (STRCMP(arg, mtable[i]) == 0) {
STRCPY(d, rtable[i]);
// '*'are changed to "star", otherwise '*' is recognized as a wildcard.
for (i = 0; except_tbl[i][0] != NULL; i++) {
if (STRCMP(arg, except_tbl[i][0]) == 0) {
STRCPY(d, except_tbl[i][1]);
break;
}
}
}
if (i < 0) { // no match in table
if (d[0] == NUL) { // no match in table
// Replace "\S" with "/\\S", etc. Otherwise every tag is matched.
// Also replace "\%^" and "\%(", they match every tag too.
// Also "\zs", "\z1", etc.

14
src/nvim/testdir/test_help_tagjump.vim
View File

@ -28,11 +28,25 @@ func Test_help_tagjump()
call assert_true(getline('.') =~ '\*quote\*')
helpclose
help *
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*star\*')
helpclose
help "*
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*quotestar\*')
helpclose
" The test result is different in vim. There ":help ??" will jump to the
" falsy operator ??, which hasn't been ported to neovim yet. Instead, neovim
" jumps to the tag "g??". This test result needs to be changed if neovim
" ports the falsy operator.
help ??
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*g??\*')
helpclose
help ch?ckhealth
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*:checkhealth\*')