diff options
| author | Enan Ajmain <3nan.ajmain@gmail.com> | 2022-07-18 06:00:08 +0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-17 17:00:08 -0700 |
| commit | 1b462705d049fa0cf2bb99bae9112b84abea8d5a (patch) | |
| tree | 67b375c191a2e81fd963f8f469edb1bd846fbb3f | |
| parent | 776913e32ea4526847b1fffe2959d2b1f7d67451 (diff) | |
| download | rneovim-1b462705d049fa0cf2bb99bae9112b84abea8d5a.tar.gz rneovim-1b462705d049fa0cf2bb99bae9112b84abea8d5a.tar.bz2 rneovim-1b462705d049fa0cf2bb99bae9112b84abea8d5a.zip | |
fix(windows):exepath, stdpath return wrong slashes #19111
exepath and stdpath should respect shellslash and return path with
proper file separator.
Closes #13787
| -rw-r--r-- | src/nvim/eval/funcs.c | 6 | ||||
| -rw-r--r-- | src/nvim/os/stdpaths.c | 4 | ||||
| -rw-r--r-- | test/functional/core/startup_spec.lua | 5 | ||||
| -rw-r--r-- | test/functional/vimscript/executable_spec.lua | 15 |
4 files changed, 28 insertions, 2 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 80586caf8e..022e2497b7 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -2048,6 +2048,12 @@ static void f_exepath(typval_T *argvars, typval_T *rettv, FunPtr fptr) (void)os_can_exe(tv_get_string(&argvars[0]), &path, true); +#ifdef BACKSLASH_IN_FILENAME + if (path != NULL) { + slash_adjust((char_u *)path); + } +#endif + rettv->v_type = VAR_STRING; rettv->vval.v_string = path; } diff --git a/src/nvim/os/stdpaths.c b/src/nvim/os/stdpaths.c index 5576e7ba07..59d315d44c 100644 --- a/src/nvim/os/stdpaths.c +++ b/src/nvim/os/stdpaths.c @@ -115,6 +115,10 @@ char *get_xdg_home(const XDGVarType idx) #else dir = concat_fnames_realloc(dir, "nvim", true); #endif + +#ifdef BACKSLASH_IN_FILENAME + slash_adjust((char_u *)dir); +#endif } return dir; } diff --git a/test/functional/core/startup_spec.lua b/test/functional/core/startup_spec.lua index 51ab0e6382..4f9df4010e 100644 --- a/test/functional/core/startup_spec.lua +++ b/test/functional/core/startup_spec.lua @@ -24,6 +24,7 @@ local iswin = helpers.iswin local startswith = helpers.startswith local write_file = helpers.write_file local meths = helpers.meths +local alter_slashes = helpers.alter_slashes local testfile = 'Xtest_startuptime' after_each(function() @@ -33,9 +34,9 @@ end) describe('startup', function() it('--clean', function() clear() - ok(string.find(meths.get_option('runtimepath'), funcs.stdpath('config'), 1, true) ~= nil) + ok(string.find(alter_slashes(meths.get_option('runtimepath')), funcs.stdpath('config'), 1, true) ~= nil) clear('--clean') - ok(string.find(meths.get_option('runtimepath'), funcs.stdpath('config'), 1, true) == nil) + ok(string.find(alter_slashes(meths.get_option('runtimepath')), funcs.stdpath('config'), 1, true) == nil) end) it('--startuptime', function() diff --git a/test/functional/vimscript/executable_spec.lua b/test/functional/vimscript/executable_spec.lua index 048a65188d..b4162b2336 100644 --- a/test/functional/vimscript/executable_spec.lua +++ b/test/functional/vimscript/executable_spec.lua @@ -17,6 +17,21 @@ describe('executable()', function() eq(1, call('executable', 'false')) end) + if iswin() then + it('exepath respects shellslash', function() + command('let $PATH = fnamemodify("./test/functional/fixtures/bin", ":p")') + eq([[test\functional\fixtures\bin\null.CMD]], call('fnamemodify', call('exepath', 'null'), ':.')) + command('set shellslash') + eq('test/functional/fixtures/bin/null.CMD', call('fnamemodify', call('exepath', 'null'), ':.')) + end) + + it('stdpath respects shellslash', function() + eq([[build\Xtest_xdg\share\nvim-data]], call('fnamemodify', call('stdpath', 'data'), ':.')) + command('set shellslash') + eq('build/Xtest_xdg/share/nvim-data', call('fnamemodify', call('stdpath', 'data'), ':.')) + end) + end + it('fails for invalid values', function() for _, input in ipairs({'v:null', 'v:true', 'v:false', '{}', '[]'}) do eq('Vim(call):E928: String required', exc_exec('call executable('..input..')')) |