Skip to content

Commit 7e21eb0

Browse files
WIP CLAUDE fix tsserver renamed to ts_ls in Mason/lspconfig
1 parent b849cdd commit 7e21eb0

1 file changed

Lines changed: 15 additions & 3 deletions

File tree

init.lua

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,17 @@ vim.api.nvim_create_autocmd('TextYankPost', {
205205
end,
206206
})
207207

208+
vim.api.nvim_create_autocmd('BufWritePre', {
209+
desc = 'Remove trailing whitespace on save',
210+
group = vim.api.nvim_create_augroup('kickstart-trim-whitespace', { clear = true }),
211+
pattern = '*',
212+
callback = function()
213+
local save_cursor = vim.fn.getpos(".")
214+
vim.cmd([[%s/\s\+$//e]])
215+
vim.fn.setpos(".", save_cursor)
216+
end,
217+
})
218+
208219
-- [[ Install `lazy.nvim` plugin manager ]]
209220
-- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info
210221
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
@@ -479,6 +490,7 @@ require('lazy').setup({
479490
vim.keymap.set('n', '<leader>f', builtin.find_files, { desc = '[S]earch [F]iles' })
480491
vim.keymap.set('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' })
481492
vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' })
493+
vim.keymap.set('n', '<leader>gd', builtin.grep_string, { desc = '[G] to [D]efinition' })
482494
vim.keymap.set('n', '<leader>F', builtin.live_grep, { desc = '[S]earch by [G]rep' })
483495
vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' })
484496
vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })
@@ -709,8 +721,8 @@ require('lazy').setup({
709721
-- Some languages (like typescript) have entire language plugins that can be useful:
710722
-- https://github.com/pmizio/typescript-tools.nvim
711723
--
712-
-- But for many setups, the LSP (`tsserver`) will work just fine
713-
tsserver = {},
724+
-- But for many setups, the LSP (`ts_ls`) will work just fine
725+
ts_ls = {},
714726
--
715727

716728
lua_ls = {
@@ -751,7 +763,7 @@ require('lazy').setup({
751763
local server = servers[server_name] or {}
752764
-- This handles overriding only values explicitly passed
753765
-- by the server configuration above. Useful when disabling
754-
-- certain features of an LSP (for example, turning off formatting for tsserver)
766+
-- certain features of an LSP (for example, turning off formatting for ts_ls)
755767
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
756768
require('lspconfig')[server_name].setup(server)
757769
end,

0 commit comments

Comments
 (0)