mirror of
https://github.com/neovim/neovim
synced 2025-07-16 17:21:49 +00:00
fix(lua): change some vim.fn.expand() to vim.fs.normalize() (#29583)
Unlike vim.fn.expand(), vim.fs.normalize() doesn't expand wildcards.
This commit is contained in:
@ -50,11 +50,11 @@ local function check_config()
|
|||||||
|
|
||||||
local init_lua = vim.fn.stdpath('config') .. '/init.lua'
|
local init_lua = vim.fn.stdpath('config') .. '/init.lua'
|
||||||
local init_vim = vim.fn.stdpath('config') .. '/init.vim'
|
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
|
if vim.fn.filereadable(vimrc) == 0 and vim.fn.filereadable(init_vim) == 0 then
|
||||||
ok = false
|
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(
|
health.warn(
|
||||||
('%s user config file: %s'):format(
|
('%s user config file: %s'):format(
|
||||||
-1 == vim.fn.getfsize(vimrc) and 'Missing' or 'Unreadable',
|
-1 == vim.fn.getfsize(vimrc) and 'Missing' or 'Unreadable',
|
||||||
@ -114,7 +114,7 @@ local function check_config()
|
|||||||
)
|
)
|
||||||
shadafile = (
|
shadafile = (
|
||||||
vim.o.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
|
shadafile
|
||||||
))
|
))
|
||||||
or (vim.o.shadafile == 'NONE' and '' or vim.o.shadafile)
|
or (vim.o.shadafile == 'NONE' and '' or vim.o.shadafile)
|
||||||
|
@ -136,7 +136,7 @@ function M.open(path)
|
|||||||
})
|
})
|
||||||
local is_uri = path:match('%w+:')
|
local is_uri = path:match('%w+:')
|
||||||
if not is_uri then
|
if not is_uri then
|
||||||
path = vim.fn.expand(path)
|
path = vim.fs.normalize(path)
|
||||||
end
|
end
|
||||||
|
|
||||||
local cmd --- @type string[]
|
local cmd --- @type string[]
|
||||||
|
Reference in New Issue
Block a user