Skip to content

Commit bea08d8

Browse files
committed
fix: handle the deprecation warnings
1 parent d9b826b commit bea08d8

File tree

3 files changed

+26
-36
lines changed

3 files changed

+26
-36
lines changed

flake.lock

Lines changed: 3 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,6 @@
100100
flake = false;
101101
};
102102

103-
lsp-config-src = {
104-
url = "github:neovim/nvim-lspconfig";
105-
flake = false;
106-
};
107-
108103
wilder-nvim-src = {
109104
url = "github:gelguy/wilder.nvim";
110105
flake = false;
@@ -497,7 +492,7 @@
497492
vimPlugins.coq_nvim
498493
vimPlugins.lsp_signature-nvim
499494
vimPlugins.lspkind-nvim
500-
lsp-config
495+
# lsp-config
501496
vimPlugins.plenary-nvim
502497
vimPlugins.popup-nvim
503498

required_lua_modules/lsp.lua

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@ require("crates").setup({
4545
})
4646

4747
require("trouble").setup({})
48-
require("lspconfig").terraformls.setup({
48+
vim.lsp.config("terraformls", {
4949
cmd = { "terraform-lsp" },
5050
})
51-
require("lspconfig").lua_ls.setup({
51+
vim.lsp.enable("terraformls")
52+
53+
vim.lsp.config("lua_ls", {
5254
cmd = { "lua-language-server" },
5355
settings = {
5456
Lua = {
@@ -60,25 +62,30 @@ require("lspconfig").lua_ls.setup({
6062
},
6163
workspace = {
6264
library = vim.api.nvim_get_runtime_file("", true),
65+
checkThirdParty = false,
6366
},
6467
telemetry = {
6568
enable = false,
6669
},
6770
},
6871
},
6972
})
73+
vim.lsp.enable("lua_ls")
7074

71-
require("lspconfig").clangd.setup({
75+
vim.lsp.config("clangd", {
7276
cmd = { "clangd" },
7377
})
78+
vim.lsp.enable("clangd")
7479

75-
require("lspconfig").gopls.setup({
80+
vim.lsp.config("gopls", {
7681
cmd = { "gopls" },
7782
})
83+
vim.lsp.enable("gopls")
7884

79-
require("lspconfig").r_language_server.setup({
85+
vim.lsp.config("r_language_server", {
8086
cmd = { "R", "--slave", "-e", "langaugeserver::run()" },
8187
})
88+
vim.lsp.enable("r_language_sever")
8289

8390
require("lsp_signature").setup({
8491
bind = true,
@@ -139,11 +146,13 @@ vim.api.nvim_create_autocmd("FileType", {
139146
local capabilities = vim.lsp.protocol.make_client_capabilities()
140147
capabilities.textDocument.completion.completionItem.snippetSupport = true
141148

142-
require("lspconfig").jsonls.setup({
149+
vim.lsp.config("jsonls", {
143150
cmd = { "vscode-json-language-server", "--stdio" },
144151
capabilities = capabilities,
145152
})
146153

154+
vim.lsp.enable("jsonls")
155+
147156
function show_documentation()
148157
local filetype = vim.bo.filetype
149158
if vim.tbl_contains({ "vim", "help" }, filetype) then
@@ -164,7 +173,7 @@ end
164173

165174
vim.fn.setenv("CARGO_TARGET_DIR", "target_dirs/nix_ra")
166175

167-
require("lspconfig").tinymist.setup({})
176+
vim.lsp.enable("tinymist")
168177
require("typescript-tools").setup({
169178
tsserver_path = "./node_modules/typescript/lib/",
170179
})
@@ -236,9 +245,10 @@ vim.g.loaded_coqtail = 1
236245
vim.g["coqtail#supported"] = 0
237246
require("coq-lsp").setup()
238247

239-
require("lspconfig").ocamllsp.setup({
248+
vim.lsp.config("ocamllsp", {
240249
cmd = { "ocamllsp", "--fallback-read-dot-merlin" },
241250
})
251+
vim.lsp.enable("ocamllsp")
242252

243253
vim.api.nvim_create_autocmd({ "BufWritePost" }, {
244254
pattern = { "*.ml", "*.mli" },
@@ -247,7 +257,7 @@ vim.api.nvim_create_autocmd({ "BufWritePost" }, {
247257
end,
248258
})
249259

250-
require("lspconfig").nil_ls.setup({
260+
vim.lsp.config("nil_ls", {
251261
settings = {
252262
["nil"] = {
253263
nix = {
@@ -259,12 +269,14 @@ require("lspconfig").nil_ls.setup({
259269
},
260270
},
261271
})
272+
vim.lsp.enable("nil_ls")
262273

263-
require("lspconfig").ruff.setup({
274+
vim.lsp.config("ruff", {
264275
init_options = {
265276
settings = {},
266277
},
267278
})
279+
vim.lsp.enable("ruff")
268280

269281
local r = require("symbols.recipes")
270282
require("symbols").setup(r.DefaultFilters, r.AsciiSymbols, {

0 commit comments

Comments
 (0)