From 1f280b582f32c8ab7de41a34472fb856d5d2f7c4 Mon Sep 17 00:00:00 2001 From: shadmansaleh Date: Sat, 12 Jun 2021 12:10:05 +0600 Subject: fixup(runtime): Fix lua runtime files not listed lua runtime files weren't listed in :scriptname & profiler. This fixes that. * Add tests * Small doc tweeks --- src/nvim/ex_cmds2.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 4798e93b91..9abeee47f4 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -2809,10 +2809,6 @@ int do_source(char_u *fname, int check_other, int is_vimrc) proftime_T wait_start; bool trigger_source_post = false; - if (path_with_extension((const char *)fname, "lua")) { - return (int)nlua_exec_file((const char *)fname); - } - p = expand_env_save(fname); if (p == NULL) { return retval; @@ -3005,10 +3001,15 @@ int do_source(char_u *fname, int check_other, int is_vimrc) firstline = p; } - // Call do_cmdline, which will call getsourceline() to get the lines. - do_cmdline(firstline, getsourceline, (void *)&cookie, - DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_REPEAT); - retval = OK; + if (path_with_extension((const char *)fname, "lua")) { + // Source the file as lua + retval = (int)nlua_exec_file((const char *)fname); + } else { + // Call do_cmdline, which will call getsourceline() to get the lines. + do_cmdline(firstline, getsourceline, (void *)&cookie, + DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_REPEAT); + retval = OK; + } if (l_do_profiling == PROF_YES) { // Get "si" again, "script_items" may have been reallocated. -- cgit From cdbc733ec4302c6cc4269c99b725b32595a01c20 Mon Sep 17 00:00:00 2001 From: shadmansaleh Date: Sat, 12 Jun 2021 14:57:45 +0600 Subject: refactor(startup): Load init.lua with do_sorce This was init.lua will be logged in startuptime --- src/nvim/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/main.c b/src/nvim/main.c index 53043d293e..7d7eba2105 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1811,7 +1811,7 @@ static bool do_user_initialization(void) char_u *init_lua_path = (char_u *)stdpaths_user_conf_subpath("init.lua"); if (os_path_exists(init_lua_path) - && nlua_exec_file((const char *)init_lua_path)) { + && do_source(init_lua_path, true, DOSO_VIMRC)) { os_setenv("MYVIMRC", (const char *)init_lua_path, 1); char_u *vimrc_path = (char_u *)stdpaths_user_conf_subpath("init.vim"); -- cgit