mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-21 23:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0359: MS-Windows: relative import in a script sourced from a buffer doesn't work

Browse Source 
Problem:  MS-Windows: Relative import in a script sourced from a buffer
          doesn't work (Ernie Rael)
Solution: Set a filename, so that we are not trying to use
          script-relative filename (Yegappan Lakshmanan)

When a script is sourced from a buffer, the file name is set to ":source
buffer=". In MS-Windows, the ":" is a path separator character (used
after a drive letter). This results in the code trying to use the ":"
prefix to import the script on MS-Windows. To fix this, when importing a
script from a script sourced from a buffer with nofile, don't use
a script relative path name.

fixes vim/vim#14588
closes: vim/vim#14603

f135fa28e4

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
Jan Edmund Lazo
2025-10-20 21:20:08 -04:00
parent 96a514ed46
commit 2a28149efc
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/runtime.c
View File

@@ -1993,14 +1993,19 @@ static char *do_source_buffer_init(source_cookie_T *sp, const exarg_T *eap, bool
return NULL; return NULL;
} }
if (ex_lua) { char *fname;
// Use ":{range}lua buffer=<num>" as the script name if (curbuf->b_ffname != NULL) {
snprintf(IObuff, IOSIZE, ":{range}lua buffer=%d", curbuf->b_fnum); fname = xstrdup(curbuf->b_ffname);
} else { } else {
// Use ":source buffer=<num>" as the script name if (ex_lua) {
snprintf(IObuff, IOSIZE, ":source buffer=%d", curbuf->b_fnum); // Use ":{range}lua buffer=<num>" as the script name
snprintf(IObuff, IOSIZE, ":{range}lua buffer=%d", curbuf->b_fnum);
} else {
// Use ":source buffer=<num>" as the script name
snprintf(IObuff, IOSIZE, ":source buffer=%d", curbuf->b_fnum);
}
fname = xstrdup(IObuff);
} }
char *fname = xstrdup(IObuff);
ga_init(&sp->buflines, sizeof(char *), 100); ga_init(&sp->buflines, sizeof(char *), 100);
// Copy the lines from the buffer into a grow array // Copy the lines from the buffer into a grow array

11
test/functional/ex_cmds/source_spec.lua
View File

@@ -247,12 +247,15 @@ describe(':source', function()
feed('dd') feed('dd')
feed_command(':source') feed_command(':source')
local filepath = fn.expand('%:p')
if filepath == '' then
filepath = ':source buffer=1'
end
eq(12, eval('g:c')) eq(12, eval('g:c'))
eq(' \\ 1\n "\\ 2', exec_lua('return _G.a')) eq(' \\ 1\n "\\ 2', exec_lua('return _G.a'))
eq(':source buffer=1', api.nvim_get_var('sfile_value')) eq(filepath, api.nvim_get_var('sfile_value'))
eq(':source buffer=1', api.nvim_get_var('stack_value')) eq(filepath, api.nvim_get_var('stack_value'))
eq(':source buffer=1', api.nvim_get_var('script_value')) eq(filepath, api.nvim_get_var('script_value'))
end) end)
end end