mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-03 00:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't show entire context when completing

Browse Source
This commit is contained in:
Tony Chen
2020-11-30 08:33:52 -05:00
committed by chentau
parent 901dd79f6a
commit d95a465b43
6 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1292,7 +1292,7 @@ static void nlua_add_treesitter(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
lua_setfield(lstate, -2, "_ts_parse_query");
}
int nlua_expand_pat(char_u *pat, int *num_results, char_u ***results)
int nlua_expand_pat(expand_T *xp, char_u *pat, int *num_results, char_u ***results)
{
lua_State *const lstate = nlua_enter();
int ret = OK;
@@ -1307,10 +1307,11 @@ int nlua_expand_pat(char_u *pat, int *num_results, char_u ***results)
// [ vim, vim._log_keystroke, buf ]
lua_pushlstring(lstate, (const char *)pat, STRLEN(pat));
if (lua_pcall(lstate, 1, 1, 0)) {
if (lua_pcall(lstate, 1, 2, 0) != 0) {
nlua_error(
lstate,
_("Error executing vim._expand_pat: %.*s"));
return FAIL;
}
Error err = ERROR_INIT;
@@ -1318,12 +1319,18 @@ int nlua_expand_pat(char_u *pat, int *num_results, char_u ***results)
*num_results = 0;
*results = NULL;
Array completions = nlua_pop_Array(lstate, &err);
int prefix_len = (int)nlua_pop_Integer(lstate, &err);
if (ERROR_SET(&err)) {
ret = FAIL;
goto cleanup;
}
Array completions = nlua_pop_Array(lstate, &err);
if (ERROR_SET(&err)) {
ret = FAIL;
goto cleanup_array;
}
garray_T result_array;
ga_init(&result_array, (int)sizeof(char *), 80);
for (size_t i = 0; i < completions.size; i++) {
@@ -1331,7 +1338,7 @@ int nlua_expand_pat(char_u *pat, int *num_results, char_u ***results)
if (v.type != kObjectTypeString) {
ret = FAIL;
goto cleanup;
goto cleanup_array;
}
GA_APPEND(
@@ -1340,12 +1347,15 @@ int nlua_expand_pat(char_u *pat, int *num_results, char_u ***results)
vim_strsave((char_u *)v.data.string.data));
}
xp->xp_pattern += prefix_len;
*results = result_array.ga_data;
*num_results = result_array.ga_len;
cleanup:
cleanup_array:
api_free_array(completions);
cleanup:
if (ret == FAIL) {
ga_clear(&result_array);
}