Mercurial > vim
changeset 8849:9f40a379ff1e v7.4.1712
commit https://github.com/vim/vim/commit/49b27326447d0827c59c6cd201d58f65c1163086
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Apr 5 21:13:00 2016 +0200
patch 7.4.1712
Problem: For plugins in packages, plugin authors need to take care of all
dependencies.
Solution: When loading "start" packages and for :packloadall, first add all
directories to 'runtimepath' before sourcing plugins.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 05 Apr 2016 21:15:06 +0200 |
| parents | b770e57bb8e6 |
| children | be0dbaf8957f |
| files | src/ex_cmds2.c src/testdir/test_packadd.vim src/version.c |
| diffstat | 3 files changed, 46 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -3313,6 +3313,11 @@ source_all_matches(char_u *pat) } } +/* used for "cookie" of add_pack_plugin() */ +static int APP_ADD_DIR; +static int APP_LOAD; +static int APP_BOTH; + static void add_pack_plugin(char_u *fname, void *cookie) { @@ -3324,11 +3329,10 @@ add_pack_plugin(char_u *fname, void *coo int oldlen; int addlen; char_u *ffname = fix_fname(fname); - int load_files = cookie != NULL; if (ffname == NULL) return; - if (strstr((char *)p_rtp, (char *)ffname) == NULL) + if (cookie != &APP_LOAD && strstr((char *)p_rtp, (char *)ffname) == NULL) { /* directory not in 'runtimepath', add it */ p4 = p3 = p2 = p1 = get_past_head(ffname); @@ -3374,7 +3378,7 @@ add_pack_plugin(char_u *fname, void *coo vim_free(new_rtp); } - if (load_files) + if (cookie != &APP_ADD_DIR) { static char *plugpat = "%s/plugin/**/*.vim"; static char *ftpat = "%s/ftdetect/*.vim"; @@ -3423,8 +3427,14 @@ ex_packloadall(exarg_T *eap) if (!did_source_packages || (eap != NULL && eap->forceit)) { did_source_packages = TRUE; + + /* First do a round to add all directories to 'runtimepath', then load + * the plugins. This allows for plugins to use an autoload directory + * of another plugin. */ do_in_path(p_pp, (char_u *)"pack/*/start/*", DIP_ALL + DIP_DIR, - add_pack_plugin, p_pp); + add_pack_plugin, &APP_ADD_DIR); + do_in_path(p_pp, (char_u *)"pack/*/start/*", DIP_ALL + DIP_DIR, + add_pack_plugin, &APP_LOAD); } } @@ -3444,7 +3454,7 @@ ex_packadd(exarg_T *eap) return; vim_snprintf(pat, len, plugpat, eap->arg); do_in_path(p_pp, (char_u *)pat, DIP_ALL + DIP_DIR + DIP_ERR, - add_pack_plugin, eap->forceit ? NULL : p_pp); + add_pack_plugin, eap->forceit ? &APP_ADD_DIR : &APP_BOTH); vim_free(pat); }
--- a/src/testdir/test_packadd.vim +++ b/src/testdir/test_packadd.vim @@ -87,14 +87,39 @@ func Test_packadd_completion() endfunc func Test_packloadall() - let plugindir = &packpath . '/pack/mine/start/foo/plugin' - call mkdir(plugindir, 'p') - call writefile(['let g:plugin_foo_number = 1234'], plugindir . '/bar.vim') + " plugin foo with an autoload directory + let fooplugindir = &packpath . '/pack/mine/start/foo/plugin' + call mkdir(fooplugindir, 'p') + call writefile(['let g:plugin_foo_number = 1234', + \ 'let g:plugin_foo_auto = bbb#value', + \ 'let g:plugin_extra_auto = extra#value'], fooplugindir . '/bar.vim') + let fooautodir = &packpath . '/pack/mine/start/foo/autoload' + call mkdir(fooautodir, 'p') + call writefile(['let bar#value = 77'], fooautodir . '/bar.vim') + + " plugin aaa with an autoload directory + let aaaplugindir = &packpath . '/pack/mine/start/aaa/plugin' + call mkdir(aaaplugindir, 'p') + call writefile(['let g:plugin_aaa_number = 333', + \ 'let g:plugin_aaa_auto = bar#value'], aaaplugindir . '/bbb.vim') + let aaaautodir = &packpath . '/pack/mine/start/aaa/autoload' + call mkdir(aaaautodir, 'p') + call writefile(['let bbb#value = 55'], aaaautodir . '/bbb.vim') + + " plugin extra with only an autoload directory + let extraautodir = &packpath . '/pack/mine/start/extra/autoload' + call mkdir(extraautodir, 'p') + call writefile(['let extra#value = 99'], extraautodir . '/extra.vim') + packloadall call assert_equal(1234, g:plugin_foo_number) + call assert_equal(55, g:plugin_foo_auto) + call assert_equal(99, g:plugin_extra_auto) + call assert_equal(333, g:plugin_aaa_number) + call assert_equal(77, g:plugin_aaa_auto) " only works once - call writefile(['let g:plugin_bar_number = 4321'], plugindir . '/bar2.vim') + call writefile(['let g:plugin_bar_number = 4321'], fooplugindir . '/bar2.vim') packloadall call assert_false(exists('g:plugin_bar_number'))