Fix problems when relative paths are passed

2 files changed, 12 insertions, 1 deletions

diff --git a/lua/nvim_lsp/clangd.lua b/lua/nvim_lsp/clangd.lua
index 59649f8e..34389721 100644
--- a/lua/nvim_lsp/clangd.lua
+++ b/lua/nvim_lsp/clangd.lua
@@ -7,7 +7,9 @@ configs.clangd = {
     cmd = {"clangd", "--background-index"};
     filetypes = {"c", "cpp", "objc", "objcpp"};
     root_dir = function(fname)
-      return root_pattern(fname) or util.path.dirname(fname)
+      local filename = util.path.is_absolute(fname) and fname
+        or util.path.join(vim.loop.cwd(), fname)
+      return root_pattern(filename) or util.path.dirname(filename)
     end;
   };
   -- commands = {};
diff --git a/lua/nvim_lsp/util.lua b/lua/nvim_lsp/util.lua
index 433bcab2..82767905 100644
--- a/lua/nvim_lsp/util.lua
+++ b/lua/nvim_lsp/util.lua
@@ -128,6 +128,14 @@ M.path = (function()
     end
   end
 
+  local function is_absolute(filename)
+    if is_windows then
+      return filename:match("^%a:") or filename:match("^\\\\")
+    else
+      return filename:match("^/")
+    end
+  end
+
   local dirname
   do
     local strip_dir_pat = path_sep.."([^"..path_sep.."]+)$"
@@ -195,6 +203,7 @@ M.path = (function()
   return {
     is_dir = is_dir;
     is_file = is_file;
+    is_absolute = is_absolute;
     exists = exists;
     sep = path_sep;
     dirname = dirname;