Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(lspinfo): normalize fname path correctly #2343

Merged
merged 5 commits into from
Feb 15, 2023
Merged

fix(lspinfo): normalize fname path correctly #2343

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
083af95
fix(lspinfo): normalize `fname` path correctly
musjj Dec 23, 2022
368e2c5
fix(lspinfo): fallback to `fnamemodify` and `resolve` if file doesn't…
musjj Dec 24, 2022
bbea45f
fix(lspinfo): normalize Windows slashes and handle double separators
musjj Dec 24, 2022
d380346
nit(lspinfo): use aliases
musjj Dec 26, 2022
d8fcea3
fix: improve check
glepnir Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lua/lspconfig/ui/lspinfo.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,14 @@ local function make_client_info(client, fname)
local workspace_folders = fn.has 'nvim-0.9' == 1 and client.workspace_folders or client.workspaceFolders
local uv = vim.loop
local is_windows = uv.os_uname().version:match 'Windows'
fname = vim.fn.fnamemodify(vim.fn.resolve(fname), ':p')
fname = uv.fs_realpath(fname) or fn.fnamemodify(fn.resolve(fname), ':p')
if is_windows then
fname:gsub('%/', '%\\')
end
local sep = is_windows and '\\' or '/'
local fname_parts = vim.split(fname, sep, { trimempty = true })
local fname_parts = vim.tbl_filter(function(v)
return #v > 0
end, vim.split(fname, sep))
if workspace_folders then
for _, schema in pairs(workspace_folders) do
local matched = true
Expand Down