From 33121f1eaea524e915a9d997d89cdd25b966dc07 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 9 Jul 2024 19:17:50 +0800 Subject: [PATCH] fix(lua): change some vim.fn.expand() to vim.fs.normalize() (#29583) Unlike vim.fn.expand(), vim.fs.normalize() doesn't expand wildcards. --- runtime/lua/nvim/health.lua | 6 +++--- runtime/lua/vim/ui.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/lua/nvim/health.lua b/runtime/lua/nvim/health.lua index 5bc03199ee..2f0a7735fd 100644 --- a/runtime/lua/nvim/health.lua +++ b/runtime/lua/nvim/health.lua @@ -50,11 +50,11 @@ local function check_config() local init_lua = vim.fn.stdpath('config') .. '/init.lua' local init_vim = vim.fn.stdpath('config') .. '/init.vim' - local vimrc = vim.env.MYVIMRC and vim.fn.expand(vim.env.MYVIMRC) or init_lua + local vimrc = vim.env.MYVIMRC and vim.fs.normalize(vim.env.MYVIMRC) or init_lua if vim.fn.filereadable(vimrc) == 0 and vim.fn.filereadable(init_vim) == 0 then ok = false - local has_vim = vim.fn.filereadable(vim.fn.expand('~/.vimrc')) == 1 + local has_vim = vim.fn.filereadable(vim.fs.normalize('~/.vimrc')) == 1 health.warn( ('%s user config file: %s'):format( -1 == vim.fn.getfsize(vimrc) and 'Missing' or 'Unreadable', @@ -114,7 +114,7 @@ local function check_config() ) shadafile = ( vim.o.shadafile == '' - and (shadafile == '' and vim.fn.stdpath('state') .. '/shada/main.shada' or vim.fn.expand( + and (shadafile == '' and vim.fn.stdpath('state') .. '/shada/main.shada' or vim.fs.normalize( shadafile )) or (vim.o.shadafile == 'NONE' and '' or vim.o.shadafile) diff --git a/runtime/lua/vim/ui.lua b/runtime/lua/vim/ui.lua index 3c947c51b0..ce583c25af 100644 --- a/runtime/lua/vim/ui.lua +++ b/runtime/lua/vim/ui.lua @@ -136,7 +136,7 @@ function M.open(path) }) local is_uri = path:match('%w+:') if not is_uri then - path = vim.fn.expand(path) + path = vim.fs.normalize(path) end local cmd --- @type string[]