fix(lspinfo): normalize fname path correctly
#2343
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
relate #2320 cc @williamboman |
|
I guess we can just normalize the slashes manually? |
|
yes. I prefer manually |
There was a problem hiding this comment.
Ah, interesting. Maybe we should stick to libuv, but we'll need to default to fname as-is (see #2320)
lua/lspconfig/ui/lspinfo.lua
Outdated
| @@ -112,7 +112,7 @@ 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 = vim.loop.fs_realpath(fname) | |||
There was a problem hiding this comment.
Suggested change
| fname = vim.loop.fs_realpath(fname) | |
| fname = vim.loop.fs_realpath(fname) or fname |
|
Re-added the previous method as a fallback + a few logic to handle funky separators. What do you think? |
glepnir
reviewed
Dec 25, 2022
Co-authored-by: Raphael <glephunter@gmail.com>
glepnir
reviewed
Feb 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
vim.fn.fnamemodifyandvim.fn.resolvedoesn't normalize slashes in Windows paths, which can cause:LspInfoto falsely report that the current attached client is in single file mode.As far as I know
uv.fs_realpathdoes everything thatvim.fn.fnamemodify(..., ":p")andvim.fn.resolvecan do and more, so I removed them.