Skip to content

fix(#2981): windows: root changed when navigating with LSP #2982

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

Merged
merged 3 commits into from
Nov 3, 2024
Merged

fix(#2981): windows: root changed when navigating with LSP #2982

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa1e1ec
fix #2981: nvim-tree root changed when navigating with LSP
ljie-PI Nov 2, 2024
6124d13
add error checks
ljie-PI Nov 2, 2024
6a30d5c
Merge branch 'master' into fix_issue_2981
ljie-PI Nov 3, 2024
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
21 changes: 19 additions & 2 deletions lua/nvim-tree/utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,23 @@ local function has_parentheses_and_brackets(path)
return false
end

--- Path normalizations for windows only
local function win_norm_path(path)
if path == nil then
return path
end
local norm_path = path
-- Normalize for issue #2862 and #2961
if has_parentheses_and_brackets(norm_path) then
norm_path = norm_path:gsub("/", "\\")
end
-- Normalize the drive letter
norm_path = norm_path:gsub("^%l:", function(drive)
return drive:upper()
end)
return norm_path
end

--- Get a path relative to another path.
---@param path string
---@param relative_to string|nil
Expand All @@ -80,8 +97,8 @@ function M.path_relative(path, relative_to)
end

local norm_path = path
if M.is_windows and has_parentheses_and_brackets(path) then
norm_path = path:gsub("/", "\\")
if M.is_windows then
norm_path = win_norm_path(norm_path)
end

local _, r = norm_path:find(M.path_add_trailing(relative_to), 1, true)
Expand Down
Loading