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

refactor(completion): don't add and remove '^' for Lua (#22702)

Browse Source
This commit is contained in:
zeertzjq 2023-03-17 20:09:56 +08:00 committed by GitHub
parent ba8b564986
commit 07f59467da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/cmdexpand.c
View File

@ -1206,7 +1206,6 @@ char *addstar(char *fname, size_t len, int context)
// For help tags the translation is done in find_help_tags(). // For help tags the translation is done in find_help_tags().
// For a tag pattern starting with "/" no translation is needed. // For a tag pattern starting with "/" no translation is needed.
if (context == EXPAND_HELP if (context == EXPAND_HELP
|| context == EXPAND_CHECKHEALTH
|| context == EXPAND_COLORS || context == EXPAND_COLORS
|| context == EXPAND_COMPILER || context == EXPAND_COMPILER
|| context == EXPAND_OWNSYNTAX || context == EXPAND_OWNSYNTAX
@ -1214,7 +1213,9 @@ char *addstar(char *fname, size_t len, int context)
|| context == EXPAND_PACKADD || context == EXPAND_PACKADD
|| context == EXPAND_RUNTIME || context == EXPAND_RUNTIME
|| ((context == EXPAND_TAGS_LISTFILES || context == EXPAND_TAGS) || ((context == EXPAND_TAGS_LISTFILES || context == EXPAND_TAGS)
&& fname[0] == '/')) { && fname[0] == '/')
|| context == EXPAND_CHECKHEALTH
|| context == EXPAND_LUA) {
retval = xstrnsave(fname, len); retval = xstrnsave(fname, len);
} else { } else {
new_len = len + 2; // +2 for '^' at start, NUL at end new_len = len + 2; // +2 for '^' at start, NUL at end

6
src/nvim/lua/executor.c
View File

@ -1857,12 +1857,6 @@ int nlua_expand_pat(expand_T *xp, char *pat, int *num_results, char ***results)
lua_getfield(lstate, -1, "_expand_pat"); lua_getfield(lstate, -1, "_expand_pat");
luaL_checktype(lstate, -1, LUA_TFUNCTION); luaL_checktype(lstate, -1, LUA_TFUNCTION);
// ex expansion prepends a ^, but don't worry, it is not a regex
if (pat[0] != '^') {
return FAIL;
}
pat++;
// [ vim, vim._expand_pat, buf ] // [ vim, vim._expand_pat, buf ]
lua_pushlstring(lstate, (const char *)pat, strlen(pat)); lua_pushlstring(lstate, (const char *)pat, strlen(pat));