removed deprecated require lspconfig

1 files changed, 32 insertions, 28 deletions

diff --git a/lua/aotrix/plugins/lsp.lua b/lua/aotrix/plugins/lsp.lua
index 0b02ad4..1841fc6 100644
--- a/lua/aotrix/plugins/lsp.lua
+++ b/lua/aotrix/plugins/lsp.lua
@@ -6,47 +6,51 @@ return {
     config = function()
         require("mason").setup()
         require("mason-lspconfig").setup({
-            ensure_installed = {"cmake", "lua_ls"}
+            ensure_installed = { "cmake", "lua_ls" }
         })
-        require('lspconfig').clangd.setup({
-            root_dir = function(fname)
-                return require("lspconfig.util").root_pattern("CMakeLists.txt",
-                                                              "Makefile",
-                                                              "configure.ac",
-                                                              "configure.in",
-                                                              "config.h.in",
-                                                              "meson.build",
-                                                              "meson_options.txt",
-                                                              "build.ninja")(
-                           fname) or
-                           require("lspconfig.util").root_pattern(
-                               "compile_commands.json", "compile_flags.txt")(
-                               fname) or
-                           require("lspconfig.util").find_git_ancestor(fname)
-            end,
-            capabilities = {
-                offsetEncoding = {"utf-16"},
-                textDocument = {
-                    completion = {completionItem = {snippetSupport = true}}
-                }
-            },
+        vim.lsp.config["clangd"] = {
             cmd = {
                 "clangd", "--background-index", "--clang-tidy",
                 "--header-insertion=iwyu", "--completion-style=detailed",
                 "--function-arg-placeholders", "--fallback-style=llvm"
             },
+            root_markers = { { "CMakeLists.txt",
+                "Makefile",
+                "configure.ac",
+                "configure.in",
+                "config.h.in",
+                "meson.build",
+                "meson_options.txt",
+                "build.ninja" },
+                { "compile_commands.json", "compile_flags.txt" },
+                { ".git" } },
+            filetypes = { "cpp", "hpp", "c", "h" },
+
+            capabilities = {
+                offsetEncoding = { "utf-16" },
+                textDocument = {
+                    semanticTokens = {
+                        multilineTokenSupport = true,
+                    },
+                    completion = { completionItem = { snippetSupport = true } }
+                }
+            },
             init_options = {
                 usePlaceholders = true,
                 completeUnimported = true,
                 clangdFileStatus = true
             }
-        })
+        }
 
         vim.keymap.set("n", "<leader>o", "<cmd>ClangdSwitchSourceHeader<cr>")
 
-        require('lspconfig').cmake.setup({})
-        require('lspconfig').lua_ls.setup({
-            settings = {completion = {callSnippet = 'Replace'}}
-        })
+        vim.lsp.config["cmake"] = {}
+        vim.lsp.config["lua_ls"] = {
+            settings = { completion = { callSnippet = 'Replace' } }
+        }
+
+        vim.lsp.enable("clangd")
+        vim.lsp.enable("cmake")
+        vim.lsp.enable("lua_ls")
     end
 }