some bugfixes for the upcomming version of neovim (0.12.0)

This commit is contained in:
pika 2024-09-19 13:55:22 +02:00
parent 23a5559fc8
commit e8dddacc01
4 changed files with 14 additions and 48 deletions

View file

@ -7,16 +7,10 @@ return {
{ "folke/neodev.nvim", opts = {} },
},
config = function()
-- import lspconfig plugin
local lspconfig = require("lspconfig")
-- import mason_lspconfig plugin
local mason_lspconfig = require("mason-lspconfig")
-- import cmp-nvim-lsp plugin
local cmp_nvim_lsp = require("cmp_nvim_lsp")
local keymap = vim.keymap -- for conciseness
local keymap = vim.keymap
vim.api.nvim_create_autocmd("LspAttach", {
group = vim.api.nvim_create_augroup("UserLspConfig", {}),
@ -57,21 +51,18 @@ return {
end
mason_lspconfig.setup_handlers({
-- default handler for installed servers
function(server_name)
lspconfig[server_name].setup({
capabilities = capabilities,
})
end,
["svelte"] = function()
-- configure svelte server
lspconfig["svelte"].setup({
capabilities = capabilities,
on_attach = function(client, bufnr)
vim.api.nvim_create_autocmd("BufWritePost", {
pattern = { "*.js", "*.ts" },
callback = function(ctx)
-- Here use ctx.match instead of ctx.file
client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.match })
end,
})
@ -79,14 +70,12 @@ return {
})
end,
["graphql"] = function()
-- configure graphql language server
lspconfig["graphql"].setup({
capabilities = capabilities,
filetypes = { "graphql", "gql", "svelte", "typescriptreact", "javascriptreact" },
})
end,
["emmet_ls"] = function()
-- configure emmet language server
lspconfig["emmet_ls"].setup({
capabilities = capabilities,
filetypes = {
@ -102,12 +91,10 @@ return {
})
end,
["lua_ls"] = function()
-- ─< configure lua server (with special settings) >────────────────────────────────────
lspconfig["lua_ls"].setup({
capabilities = capabilities,
settings = {
Lua = {
-- ─< make the language server recognize "vim" global >─────────────────────────────────
diagnostics = {
globals = { "vim" },
},
@ -119,25 +106,22 @@ return {
})
end,
["cssls"] = function()
-- ─< configure CSS server >────────────────────────────────────────────────────────────
lspconfig["cssls"].setup({
capabilities = capabilities,
filetypes = {
-- "html",
"css",
"scss",
-- "php",
},
filetypes = { "css", "scss" },
})
end,
["intelephense"] = function()
-- ─< configure PHP server >────────────────────────────────────────────────────────────
lspconfig["intelephense"].setup({
capabilities = capabilities,
filetypes = {
"php",
"blade.php",
},
filetypes = { "php", "blade.php" },
})
end,
["tsserver"] = function()
-- Replace tsserver with typescript-language-server
lspconfig["typescript-language-server"].setup({
capabilities = capabilities,
filetypes = { "typescript", "typescriptreact", "javascript", "javascriptreact" },
})
end,
})

View file

@ -18,7 +18,7 @@ return {
keys = {
-- ─< just the standard two keybindings I configured. Be sure to make your own one, if you'd like >─
{ "<leader>sm", "<cmd>TelesnipShowSnippets<CR>", desc = "Open Snippet Picker" },
{ "<leader>cs", "<cmd>TelesnipCustomSnippet<CR>", desc = "Save Custom Snippet" },
{ "<leader>cs", "<cmd>TelesnipCustomSnippet<CR>", mode = "v", desc = "Save Custom Snippet" },
{ "<leader>sc", "<cmd>TelesnipCustomSnippet<CR>", desc = "Save Custom Snippet" },
{ "<leader>sc", "<cmd>TelesnipCustomSnippet<CR>", mode = "v", desc = "Save Custom Snippet" },
},
}

View file

@ -9,33 +9,18 @@ return {
require("nvim-treesitter.configs").setup({
highlight = {
enable = true,
additional_vim_regex_highlighting = false,
},
indent = { enable = true },
autotag = { enable = true },
ensure_installed = {
"bash",
"fish",
-- "http",
-- "html",
-- "php",
-- "css",
-- "scss",
-- "fish",
"gitignore",
"git_config",
"markdown",
"markdown_inline",
-- "dockerfile",
"yaml",
-- "json",
-- "javascript",
-- "typescript",
-- "graphql",
"lua",
-- "query",
-- "c",
-- "prisma",
-- "hyprlang",
"ini",
"passwd",
"vim",
@ -50,9 +35,6 @@ return {
node_decremental = "<bs>",
},
},
-- Add these fields to address the error
sync_install = true,
auto_install = true,
})
end,
}