GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-15 16:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lua): change some vim.fn.expand() to vim.fs.normalize() (#29583)

Browse Source 
Unlike vim.fn.expand(), vim.fs.normalize() doesn't expand wildcards.
This commit is contained in:
zeertzjq
2024-07-09 19:17:50 +08:00
parent 24ee2e7c74
commit 33121f1eae
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/lua/nvim/health.lua
View File

@ -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)

2
runtime/lua/vim/ui.lua
View File

@ -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[]