diff options
| author | shadmansaleh <shadmansaleh3@gmail.com> | 2021-06-12 12:10:05 +0600 |
|---|---|---|
| committer | shadmansaleh <shadmansaleh3@gmail.com> | 2021-06-13 00:27:52 +0600 |
| commit | 1f280b582f32c8ab7de41a34472fb856d5d2f7c4 (patch) | |
| tree | b33909d0982ebd681800590c95d9b78987215794 /src | |
| parent | d3bdde0bad12458128fae817aa348ac1d07b6f35 (diff) | |
| download | rneovim-1f280b582f32c8ab7de41a34472fb856d5d2f7c4.tar.gz rneovim-1f280b582f32c8ab7de41a34472fb856d5d2f7c4.tar.bz2 rneovim-1f280b582f32c8ab7de41a34472fb856d5d2f7c4.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds2.c | 17 |
1 files changed, 9 insertions, 8 deletions
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. |