diff options
author | Javier Lopez <graulopezjavier@gmail.com> | 2022-05-31 13:10:18 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-31 11:10:18 -0700 |
commit | e6652821bd32e4ff8d62a0b67fc2041a5f41e252 (patch) | |
tree | cc5106c44d65f8f504a4f3ba6654b918a6f33c13 /src | |
parent | 7380ebfc17723662f6fe1e38372f54b3d67fe082 (diff) | |
download | rneovim-e6652821bd32e4ff8d62a0b67fc2041a5f41e252.tar.gz rneovim-e6652821bd32e4ff8d62a0b67fc2041a5f41e252.tar.bz2 rneovim-e6652821bd32e4ff8d62a0b67fc2041a5f41e252.zip |
refactor(checkhealth)!: rename to vim.health, move logic to Lua #18720
- Complete function:
There was lots of unnecessary C code for the complete function, therefore
moving it to Lua and use all the plumbing we have in place to retrieve the
results.
- Moving the module:
It's important we keep nvim lua modules name spaced, avoids conflict with
plugins, luarocks, etc.
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/ex_getln.c | 81 |
1 files changed, 14 insertions, 67 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index a94d6edce2..5f12826a0c 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -233,23 +233,6 @@ static int compl_match_arraysize; static int compl_startcol; static int compl_selected; -/// |:checkhealth| completion items -/// -/// Regenerates on every new command line prompt, to accommodate changes on the -/// runtime files. -typedef struct { - garray_T names; // healthcheck names - unsigned last_gen; // last_prompt_id where names were generated -} CheckhealthComp; - -/// Cookie used when converting filepath to name -struct healthchecks_cookie { - garray_T *names; // global healthchecks - bool is_lua; // true if the current entry is a Lua healthcheck -}; - -static CheckhealthComp healthchecks = { GA_INIT(sizeof(char_u *), 10), 0 }; - #ifdef INCLUDE_GENERATED_DECLARATIONS # include "ex_getln.c.generated.h" #endif @@ -301,59 +284,23 @@ static void init_incsearch_state(incsearch_state_T *s) /// @param[in] xp Not used. static char *get_healthcheck_names(expand_T *xp, int idx) { - // Generate the first time or on new prompt. - if (healthchecks.last_gen == 0 || healthchecks.last_gen != last_prompt_id) { - ga_clear_strings(&healthchecks.names); - char *patterns[3] = { "autoload/health/**.vim", "lua/**/**/health/init.lua", // NOLINT - "lua/**/**/health.lua" }; // NOLINT - for (int i = 0; i < 3; i++) { - struct healthchecks_cookie hcookie = { .names = &healthchecks.names, .is_lua = i != 0 }; - do_in_runtimepath(patterns[i], DIP_ALL, get_healthcheck_cb, &hcookie); - - if (healthchecks.names.ga_len > 0) { - ga_remove_duplicate_strings(&healthchecks.names); - } - } - // Tracked to regenerate items on next prompt. - healthchecks.last_gen = last_prompt_id; - } - return idx < healthchecks.names.ga_len - ? ((char **)(healthchecks.names.ga_data))[idx] : NULL; -} - -/// Transform healthcheck file path into it's name. -/// -/// Used as a callback for do_in_runtimepath -/// @param[in] path Expanded path to a possible healthcheck. -/// @param[out] cookie Array where names will be inserted. -static void get_healthcheck_cb(char *path, void *cookie) -{ - if (path != NULL) { - struct healthchecks_cookie *hcookie = (struct healthchecks_cookie *)cookie; - char *pattern; - char *sub = "\\1"; - char *res; - - if (hcookie->is_lua) { - // Lua: transform "../lua/vim/lsp/health.lua" into "vim.lsp" - pattern = ".*lua[\\/]\\(.\\{-}\\)[\\/]health\\([\\/]init\\)\\?\\.lua$"; - } else { - // Vim: transform "../autoload/health/provider.vim" into "provider" - pattern = ".*[\\/]\\([^\\/]*\\)\\.vim$"; - } + static Object names = OBJECT_INIT; + static unsigned last_gen = 0; - res = do_string_sub(path, pattern, sub, NULL, "g"); - if (hcookie->is_lua && res != NULL) { - // Replace slashes with dots as represented by the healthcheck plugin. - char *ares = do_string_sub(res, "[\\/]", ".", NULL, "g"); - xfree(res); - res = ares; - } + if (last_gen != last_prompt_id || last_gen == 0) { + Array a = ARRAY_DICT_INIT; + Error err = ERROR_INIT; + Object res = nlua_exec(STATIC_CSTR_AS_STRING("return vim.health._complete()"), a, &err); + api_clear_error(&err); + api_free_object(names); + names = res; + last_gen = last_prompt_id; + } - if (res != NULL) { - GA_APPEND(char *, hcookie->names, res); - } + if (names.type == kObjectTypeArray && idx < (int)names.data.array.size) { + return names.data.array.items[idx].data.string.data; } + return NULL; } // Return true when 'incsearch' highlighting is to be done. |