aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamjan 9000 <damjan.9000@gmail.com>2024-04-17 20:42:05 +0200
committerDamjan 9000 <damjan.9000@gmail.com>2024-04-17 20:42:05 +0200
commitb6b33e61a49b162c22af5355239bfeca368dee1c (patch)
tree3fb5da2fd8973e4bb53e5e3b6f7cc14865ac0e1d
parentc0ac446e587b7a0b9651f684538364236a17fa99 (diff)
parent5540527fabc2776cf62b63ef511079b1c8bf5297 (diff)
Merge 'upstream' prefer_git, inlay hints
- add prefer_git to treesitter config - Enable inlay hints for the supporting servers
-rw-r--r--lua/kickstart/plugins/lspconfig.lua10
-rw-r--r--lua/kickstart/plugins/treesitter.lua2
-rw-r--r--lua/kickstart/plugins/which-key.lua1
3 files changed, 13 insertions, 0 deletions
diff --git a/lua/kickstart/plugins/lspconfig.lua b/lua/kickstart/plugins/lspconfig.lua
index 8da925b..4e13939 100644
--- a/lua/kickstart/plugins/lspconfig.lua
+++ b/lua/kickstart/plugins/lspconfig.lua
@@ -115,6 +115,16 @@ return {
callback = vim.lsp.buf.clear_references,
})
end
+
+ -- The following autocommand is used to enable inlay hints in your
+ -- code, if the language server you are using supports them
+ --
+ -- This may be unwanted, since they displace some of your code
+ if client and client.server_capabilities.inlayHintProvider and vim.lsp.inlay_hint then
+ map('<leader>th', function()
+ vim.lsp.inlay_hint.enable(0, not vim.lsp.inlay_hint.is_enabled())
+ end, '[T]oggle Inlay [H]ints')
+ end
end,
})
diff --git a/lua/kickstart/plugins/treesitter.lua b/lua/kickstart/plugins/treesitter.lua
index da7db63..4bf12fe 100644
--- a/lua/kickstart/plugins/treesitter.lua
+++ b/lua/kickstart/plugins/treesitter.lua
@@ -18,6 +18,8 @@ return {
config = function(_, opts)
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
+ -- Prefer git instead of curl in order to improve connectivity in some environments
+ require('nvim-treesitter.install').prefer_git = true
---@diagnostic disable-next-line: missing-fields
require('nvim-treesitter.configs').setup(opts)
diff --git a/lua/kickstart/plugins/which-key.lua b/lua/kickstart/plugins/which-key.lua
index d66449e..d37883b 100644
--- a/lua/kickstart/plugins/which-key.lua
+++ b/lua/kickstart/plugins/which-key.lua
@@ -27,6 +27,7 @@ return {
['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
+ ['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
}
end,
},