CarGDev/avante.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: get project root (#2026)

Browse Source
This commit is contained in:
yetone
2025-05-10 15:08:27 +08:00
committed by GitHub
parent 8f96d4319d
commit adae032f5f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lua/avante/utils/root.lua
View File

@@ -28,9 +28,10 @@ function M.detectors.lsp(buf)
local bufpath = M.bufpath(buf) local bufpath = M.bufpath(buf)
if not bufpath then return {} end if not bufpath then return {} end
local roots = {} ---@type string[] local roots = {} ---@type string[]
for _, client in pairs(Utils.lsp.get_clients({ bufnr = buf })) do local lsp_clients = Utils.lsp.get_clients({ bufnr = buf })
for _, client in ipairs(lsp_clients) do
local workspace = client.config.workspace_folders local workspace = client.config.workspace_folders
for _, ws in pairs(workspace or {}) do for _, ws in ipairs(workspace or {}) do
roots[#roots + 1] = vim.uri_to_fname(ws.uri) roots[#roots + 1] = vim.uri_to_fname(ws.uri)
end end
if client.root_dir then roots[#roots + 1] = client.root_dir end if client.root_dir then roots[#roots + 1] = client.root_dir end
@@ -135,8 +136,8 @@ M.cache = {}
---@param opts? {normalize?:boolean, buf?:number} ---@param opts? {normalize?:boolean, buf?:number}
---@return string ---@return string
function M.get(opts) function M.get(opts)
if Config.behaviour.use_cwd_as_project_root then
local cwd = vim.uv.cwd() local cwd = vim.uv.cwd()
if Config.behaviour.use_cwd_as_project_root then
if cwd and cwd ~= "" then return cwd end if cwd and cwd ~= "" then return cwd end
end end
opts = opts or {} opts = opts or {}
@@ -147,6 +148,7 @@ function M.get(opts)
ret = roots[1] and roots[1].paths[1] or vim.uv.cwd() ret = roots[1] and roots[1].paths[1] or vim.uv.cwd()
M.cache[buf] = ret M.cache[buf] = ret
end end
if cwd ~= nil and #ret > #cwd then ret = cwd end
if opts and opts.normalize then return ret end if opts and opts.normalize then return ret end
return Utils.is_win() and ret:gsub("/", "\\") or ret return Utils.is_win() and ret:gsub("/", "\\") or ret
end end