diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index c56c32aa..95b3ffa5 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -1,11 +1,11 @@ -- Configuration for language servers local function keymaps(bufnr) local keymap = function(keys, func, desc) - if desc then - desc = 'LSP: ' .. desc - end + if desc then + desc = 'LSP: ' .. desc + end - vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc }) + vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc }) end keymap('rn', vim.lsp.buf.rename, '[R]e[n]ame') @@ -26,7 +26,7 @@ local function keymaps(bufnr) keymap('wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder') keymap('wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder') keymap('wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end, '[W]orkspace [L]ist Folders') end @@ -38,7 +38,7 @@ return { 'williamboman/mason-lspconfig.nvim', -- Useful status updates for LSP - { 'j-hui/fidget.nvim', opts = {} }, + { 'j-hui/fidget.nvim', opts = {} }, -- Additional lua configuration, makes nvim stuff amazing! 'folke/neodev.nvim', @@ -47,10 +47,10 @@ return { local on_attach = function(_, bufnr) keymaps(bufnr) - -- Create a command `:Format` local to the LSP buffer - vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_) - vim.lsp.buf.format() - end, { desc = 'Format current buffer with LSP' }) + -- Create a command `:Format` local to the LSP buffer + vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_) + vim.lsp.buf.format() + end, { desc = 'Format current buffer with LSP' }) end -- mason-lspconfig requires that these setup functions are called in this order @@ -60,14 +60,15 @@ return { -- Enable the following language servers local servers = { - rust_analyzer = { filetypes = {'rust', 'rs'}}, - tsserver = {}, - lua_ls = { - Lua = { - workspace = { checkThirdParty = false }, - telemetry = { enable = false }, + lua_ls = { + Lua = { + workspace = { checkThirdParty = false }, + telemetry = { enable = false }, + }, }, - }, + rust_analyzer = { filetypes = { 'rust', 'rs' } }, + svelte = { filetypes = { 'svelte' } }, + tsserver = {}, } -- Setup neovim lua configuration @@ -81,19 +82,18 @@ return { local mason_lspconfig = require 'mason-lspconfig' mason_lspconfig.setup { - ensure_installed = vim.tbl_keys(servers), + ensure_installed = vim.tbl_keys(servers), } mason_lspconfig.setup_handlers { - function(server_name) - require('lspconfig')[server_name].setup { - capabilities = capabilities, - on_attach = on_attach, - settings = servers[server_name], - filetypes = (servers[server_name] or {}).filetypes, - } - end, + function(server_name) + require('lspconfig')[server_name].setup { + capabilities = capabilities, + on_attach = on_attach, + settings = servers[server_name], + filetypes = (servers[server_name] or {}).filetypes, + } + end, } - end } diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index d6d0a26c..246f6d4b 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -54,7 +54,7 @@ return { vim.defer_fn(function() require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' }, + ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'svelte', 'vimdoc', 'vim', 'bash' }, auto_install = false, sync_install = false,