aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-03-17 20:09:56 +0800
committerGitHub <noreply@github.com>2023-03-17 20:09:56 +0800
commit07f59467da5a80c7ce46fdc9efcc0e2c18633df1 (patch)
treeddece2b021c97f47a42bb18d59f753d22d6ad77e
parentba8b5649867aa0d349de789828940a48bb42888c (diff)
downloadrneovim-07f59467da5a80c7ce46fdc9efcc0e2c18633df1.tar.gz
rneovim-07f59467da5a80c7ce46fdc9efcc0e2c18633df1.tar.bz2
rneovim-07f59467da5a80c7ce46fdc9efcc0e2c18633df1.zip
refactor(completion): don't add and remove '^' for Lua (#22702)
-rw-r--r--src/nvim/cmdexpand.c5
-rw-r--r--src/nvim/lua/executor.c6
2 files changed, 3 insertions, 8 deletions
diff --git a/src/nvim/cmdexpand.c b/src/nvim/cmdexpand.c
index 18d35e1e20..220cb4cf93 100644
--- a/src/nvim/cmdexpand.c
+++ b/src/nvim/cmdexpand.c
@@ -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 a tag pattern starting with "/" no translation is needed.
if (context == EXPAND_HELP
- || context == EXPAND_CHECKHEALTH
|| context == EXPAND_COLORS
|| context == EXPAND_COMPILER
|| context == EXPAND_OWNSYNTAX
@@ -1214,7 +1213,9 @@ char *addstar(char *fname, size_t len, int context)
|| context == EXPAND_PACKADD
|| context == EXPAND_RUNTIME
|| ((context == EXPAND_TAGS_LISTFILES || context == EXPAND_TAGS)
- && fname[0] == '/')) {
+ && fname[0] == '/')
+ || context == EXPAND_CHECKHEALTH
+ || context == EXPAND_LUA) {
retval = xstrnsave(fname, len);
} else {
new_len = len + 2; // +2 for '^' at start, NUL at end
diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c
index 819e3cccff..3616f1f69f 100644
--- a/src/nvim/lua/executor.c
+++ b/src/nvim/lua/executor.c
@@ -1857,12 +1857,6 @@ int nlua_expand_pat(expand_T *xp, char *pat, int *num_results, char ***results)
lua_getfield(lstate, -1, "_expand_pat");
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 ]
lua_pushlstring(lstate, (const char *)pat, strlen(pat));