From b54823553088b24022b834e5117438e897246ffc Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Sat, 20 Jan 2024 18:37:21 -0600 Subject: [PATCH 1/3] match scroll doc binding to similar vim binding --- lua/plugins/autocompletion.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/autocompletion.lua b/lua/plugins/autocompletion.lua index a85c7202..250b9c04 100644 --- a/lua/plugins/autocompletion.lua +++ b/lua/plugins/autocompletion.lua @@ -31,7 +31,7 @@ return { mapping = cmp.mapping.preset.insert { [''] = cmp.mapping.select_next_item(), [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(-4), [''] = cmp.mapping.scroll_docs(4), [''] = cmp.mapping.complete {}, [''] = cmp.mapping.confirm { From 78c348716c037f4184d185736058c6dc7f4753ef Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Sat, 20 Jan 2024 18:42:56 -0600 Subject: [PATCH 2/3] restore mason config timing for dap startup --- lua/plugins/autocompletion.lua | 2 +- lua/plugins/lspconfig.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/plugins/autocompletion.lua b/lua/plugins/autocompletion.lua index 250b9c04..d14bdfa6 100644 --- a/lua/plugins/autocompletion.lua +++ b/lua/plugins/autocompletion.lua @@ -32,7 +32,7 @@ return { [''] = cmp.mapping.select_next_item(), [''] = cmp.mapping.select_prev_item(), [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.scroll_docs(4), [''] = cmp.mapping.complete {}, [''] = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace, diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 122cda60..a35480b1 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -33,7 +33,7 @@ return { -- LSP Configuration & Plugins 'neovim/nvim-lspconfig', dependencies = { - 'williamboman/mason.nvim', + { 'williamboman/mason.nvim', config = true }, 'williamboman/mason-lspconfig.nvim', -- Useful status updates for LSP From d6009d6e52e495419222f0cd8ba640a4c2cd8722 Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Sat, 20 Jan 2024 18:46:46 -0600 Subject: [PATCH 3/3] use all required treesitter parameters --- lua/plugins/treesitter.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index f440189e..42e19d64 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -51,14 +51,14 @@ return { build = ':TSUpdate', config = function() vim.defer_fn(function() - -- FIX: Missing required fields in type `TSConfig` 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' }, - -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, - + sync_install = false, + ignore_install = {}, + modules = {}, highlight = { enable = true }, indent = { enable = true }, incremental_selection = {