aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lingelbach <m.j.lbach@gmail.com>2021-07-05 08:49:05 -0700
committerMichael Lingelbach <m.j.lbach@gmail.com>2021-07-08 12:33:04 -0700
commit6c8a260b0d022ca3285c22813d3591715c7c816d (patch)
treea2cab1bc3b293322b78546d9249ba14457d35a85
parent[docgen] Update CONFIG.md (diff)
downloadnvim-lspconfig-6c8a260b0d022ca3285c22813d3591715c7c816d.tar
nvim-lspconfig-6c8a260b0d022ca3285c22813d3591715c7c816d.tar.gz
nvim-lspconfig-6c8a260b0d022ca3285c22813d3591715c7c816d.tar.bz2
nvim-lspconfig-6c8a260b0d022ca3285c22813d3591715c7c816d.tar.lz
nvim-lspconfig-6c8a260b0d022ca3285c22813d3591715c7c816d.tar.xz
nvim-lspconfig-6c8a260b0d022ca3285c22813d3591715c7c816d.tar.zst
nvim-lspconfig-6c8a260b0d022ca3285c22813d3591715c7c816d.zip
feat: try to resolve root for new files
-rw-r--r--lua/lspconfig/util.lua16
1 files changed, 12 insertions, 4 deletions
diff --git a/lua/lspconfig/util.lua b/lua/lspconfig/util.lua
index 625d3170..542d13eb 100644
--- a/lua/lspconfig/util.lua
+++ b/lua/lspconfig/util.lua
@@ -161,15 +161,16 @@ M.path = (function()
-- Iterate the path until we find the rootdir.
local function iterate_parents(path)
- path = uv.fs_realpath(path)
local function it(s, v)
- if not v then
+ if v and not is_fs_root(v) then
+ v = dirname(v)
+ else
return
end
- if is_fs_root(v) then
+ if not uv.fs_realpath(v) then
return
end
- return dirname(v), path
+ return v, path
end
return it, path, path
end
@@ -263,7 +264,14 @@ function M.search_ancestors(startpath, func)
if func(startpath) then
return startpath
end
+ local guard = 100
for path in M.path.iterate_parents(startpath) do
+ -- Prevent infinite recursion if our algorithm breaks
+ guard = guard - 1
+ if guard == 0 then
+ return
+ end
+
if func(path) then
return path
end