Skip to content

Commit cde9bbd

Browse files
authored
Merge branch 'nvim-lua:master' into master
2 parents fc17299 + 5aeddfd commit cde9bbd

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

init.lua

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,14 @@ require('lazy').setup({
583583
group = highlight_augroup,
584584
callback = vim.lsp.buf.clear_references,
585585
})
586+
587+
vim.api.nvim_create_autocmd('LspDetach', {
588+
group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }),
589+
callback = function(event2)
590+
vim.lsp.buf.clear_references()
591+
vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf }
592+
end,
593+
})
586594
end
587595

588596
-- The following autocommand is used to enable inlay hints in your
@@ -597,14 +605,6 @@ require('lazy').setup({
597605
end,
598606
})
599607

600-
vim.api.nvim_create_autocmd('LspDetach', {
601-
group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }),
602-
callback = function(event)
603-
vim.lsp.buf.clear_references()
604-
vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event.buf }
605-
end,
606-
})
607-
608608
-- LSP servers and clients are able to communicate to each other what features they support.
609609
-- By default, Neovim doesn't support everything that is in the LSP specification.
610610
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
@@ -892,7 +892,7 @@ require('lazy').setup({
892892
'nvim-treesitter/nvim-treesitter',
893893
build = ':TSUpdate',
894894
opts = {
895-
ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' },
895+
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' },
896896
-- Autoinstall languages that are not installed
897897
auto_install = true,
898898
highlight = {

lua/kickstart/plugins/debug.lua

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ return {
3131
require('mason-nvim-dap').setup {
3232
-- Makes a best effort to setup the various debuggers with
3333
-- reasonable debug configurations
34-
automatic_setup = true,
34+
automatic_installation = true,
3535

3636
-- You can provide additional configuration to the handlers,
3737
-- see mason-nvim-dap README for more information
@@ -85,6 +85,12 @@ return {
8585
dap.listeners.before.event_exited['dapui_config'] = dapui.close
8686

8787
-- Install golang specific config
88-
require('dap-go').setup()
88+
require('dap-go').setup {
89+
delve = {
90+
-- On Windows delve must be run attached or it crashes.
91+
-- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring
92+
detached = vim.fn.has 'win32' == 0,
93+
},
94+
}
8995
end,
9096
}

0 commit comments

Comments
 (0)