mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16188 from bfredl/packentry

Browse Source 
fix(runtime): fix missing packpath entries
This commit is contained in:
Björn Linse
2021-10-31 16:19:30 +01:00
committed by GitHub
parent 346227e3ad e6b8d4f67b
commit 4445e0230b
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/runtime.c
View File

@@ -439,16 +439,16 @@ static void expand_rtp_entry(RuntimeSearchPath *search_path, Map(String, handle_
} }
static void expand_pack_entry(RuntimeSearchPath *search_path, Map(String, handle_T) *rtp_used, static void expand_pack_entry(RuntimeSearchPath *search_path, Map(String, handle_T) *rtp_used,
CharVec *after_path, char_u *pack_entry) CharVec *after_path, char_u *pack_entry, size_t pack_entry_len)
{ {
static char buf[MAXPATHL]; static char buf[MAXPATHL];
char *(start_pat[]) = { "/pack/*/start/*", "/start/*" }; // NOLINT char *(start_pat[]) = { "/pack/*/start/*", "/start/*" }; // NOLINT
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (STRLEN(pack_entry) + STRLEN(start_pat[i]) + 1 > MAXPATHL) { if (pack_entry_len + STRLEN(start_pat[i]) + 1 > sizeof buf) {
continue; continue;
} }
STRLCPY(buf, pack_entry, MAXPATHL); STRLCPY(buf, pack_entry, sizeof buf);
xstrlcat(buf, start_pat[i], sizeof buf); STRLCPY(buf + pack_entry_len, start_pat[i], sizeof buf - pack_entry_len);
expand_rtp_entry(search_path, rtp_used, buf, false); expand_rtp_entry(search_path, rtp_used, buf, false);
size_t after_size = STRLEN(buf)+7; size_t after_size = STRLEN(buf)+7;
char *after = xmallocz(after_size); char *after = xmallocz(after_size);
@@ -507,14 +507,15 @@ RuntimeSearchPath runtime_search_path_build(void)
handle_T *h = map_ref(String, handle_T)(&pack_used, cstr_as_string((char *)buf), false); handle_T *h = map_ref(String, handle_T)(&pack_used, cstr_as_string((char *)buf), false);
if (h) { if (h) {
(*h)++; (*h)++;
expand_pack_entry(&search_path, &rtp_used, &after_path, buf); expand_pack_entry(&search_path, &rtp_used, &after_path, buf, buflen);
} }
} }
for (size_t i = 0; i < kv_size(pack_entries); i++) { for (size_t i = 0; i < kv_size(pack_entries); i++) {
handle_T h = map_get(String, handle_T)(&pack_used, kv_A(pack_entries, i)); String item = kv_A(pack_entries, i);
handle_T h = map_get(String, handle_T)(&pack_used, item);
if (h == 0) { if (h == 0) {
expand_pack_entry(&search_path, &rtp_used, &after_path, (char_u *)kv_A(pack_entries, i).data); expand_pack_entry(&search_path, &rtp_used, &after_path, (char_u *)item.data, item.size);
} }
} }

5
test/functional/core/startup_spec.lua
View File

@@ -414,6 +414,11 @@ describe('startup', function()
eq({'ordinary', 'funky!', 'FANCY', 'mittel', 'FANCY after', 'ordinary after'}, exec_lua [[ return _G.test_loadorder ]]) eq({'ordinary', 'funky!', 'FANCY', 'mittel', 'FANCY after', 'ordinary after'}, exec_lua [[ return _G.test_loadorder ]])
eq({'ordinary', 'funky!', 'mittel', 'ordinary after'}, exec_lua [[ return _G.nested_order ]]) eq({'ordinary', 'funky!', 'mittel', 'ordinary after'}, exec_lua [[ return _G.nested_order ]])
end) end)
it("handles the correct order when prepending packpath", function()
clear{args={'--cmd', 'set packpath^=test/functional/fixtures', '--cmd', [[ lua _G.test_loadorder = {} vim.cmd "runtime! filen.lua" ]]}, env={XDG_CONFIG_HOME='test/functional/fixtures/'}}
eq({'ordinary', 'FANCY', 'FANCY after', 'ordinary after'}, exec_lua [[ return _G.test_loadorder ]])
end)
end) end)
describe('sysinit', function() describe('sysinit', function()