clangd: fix capabilities by extending protocol defaults with utf-8 offset encoding

Also removes the utf8_config helper function which was only used by
clangd and is a clangd-specific protocol extension.

2 files changed, 17 insertions, 18 deletions

diff --git a/lua/lspconfig/clangd.lua b/lua/lspconfig/clangd.lua
index d165edbb..8a79f649 100644
--- a/lua/lspconfig/clangd.lua
+++ b/lua/lspconfig/clangd.lua
@@ -13,8 +13,18 @@ local function switch_source_header(bufnr)
 end
 
 local root_pattern = util.root_pattern("compile_commands.json", "compile_flags.txt", ".git")
+
+local default_capabilities = vim.tbl_deep_extend('force', vim.lsp.protocol.make_client_capabilities(), {
+  textDocument = {
+    completion = {
+      editsNearCursor = true
+    }
+  },
+  offsetEncoding = {"utf-8", "utf-16"}
+});
+
 configs.clangd = {
-  default_config = util.utf8_config {
+  default_config = {
     cmd = {"clangd", "--background-index"};
     filetypes = {"c", "cpp", "objc", "objcpp"};
     root_dir = function(fname)
@@ -22,13 +32,12 @@ configs.clangd = {
         or util.path.join(vim.loop.cwd(), fname)
       return root_pattern(filename) or util.path.dirname(filename)
     end;
-    capabilities = {
-      textDocument = {
-        completion = {
-          editsNearCursor = true
-        }
-      }
-    },
+    on_init = function(client, result)
+      if result.offsetEncoding then
+        client.offset_encoding = result.offsetEncoding
+      end
+    end;
+    capabilities = default_capabilities;
   };
   commands = {
     ClangdSwitchSourceHeader = {
diff --git a/lua/lspconfig/util.lua b/lua/lspconfig/util.lua
index d218b25d..5b45ff51 100644
--- a/lua/lspconfig/util.lua
+++ b/lua/lspconfig/util.lua
@@ -326,16 +326,6 @@ function M.find_package_json_ancestor(startpath)
   end)
 end
 
-function M.utf8_config(config)
-  config.capabilities = config.capabilities or lsp.protocol.make_client_capabilities()
-  config.capabilities.offsetEncoding = {"utf-8", "utf-16"}
-  function config.on_init(client, result)
-    if result.offsetEncoding then
-      client.offset_encoding = result.offsetEncoding
-    end
-  end
-  return config
-end
 
 return M
 -- vim:et ts=2 sw=2