Merge 'upstream' timeoutlen, cmp scroll, friendly snippets, luasnip, ruby

Merged:
- fix: disable ts indenting for Ruby
- doc: add note about advanced luasnip features
- Move friendly snippets to dependencies of LuaSnip (#759)
- Add <C-b>/<C-f> cmp mapping to scroll cmp docs (#750)
- doc: add info about timeoutlen (#691)
This commit is contained in:
Damjan 9000
2024-03-15 18:15:40 +01:00
3 changed files with 29 additions and 8 deletions

View File

@@ -15,6 +15,17 @@ return {
end
return 'make install_jsregexp'
end)(),
dependencies = {
-- `friendly-snippets` contains a variety of premade snippets.
-- See the README about individual language/framework/plugin snippets:
-- https://github.com/rafamadriz/friendly-snippets
-- {
-- 'rafamadriz/friendly-snippets',
-- config = function()
-- require('luasnip.loaders.from_vscode').lazy_load()
-- end,
-- },
},
},
'saadparwaiz1/cmp_luasnip',
@@ -23,12 +34,6 @@ return {
-- into multiple repos for maintenance purposes.
'hrsh7th/cmp-nvim-lsp',
'hrsh7th/cmp-path',
-- If you want to add a bunch of pre-configured snippets,
-- you can use this plugin to help you. It even has snippets
-- for various frameworks/libraries/etc. but you will have to
-- set up the ones that are useful for you.
-- 'rafamadriz/friendly-snippets',
},
config = function()
-- See `:help cmp`
@@ -54,6 +59,10 @@ return {
-- Select the [p]revious item
['<C-p>'] = cmp.mapping.select_prev_item(),
-- scroll the documentation window [b]ack / [f]orward
['<C-b>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4),
-- Accept ([y]es) the completion.
-- This will auto-import if your LSP supports it.
-- This will expand snippets if the LSP sent a snippet.
@@ -82,6 +91,9 @@ return {
luasnip.jump(-1)
end
end, { 'i', 's' }),
-- For more advanced luasnip keymaps (e.g. selecting choice nodes, expansion) see:
-- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
},
sources = {
{ name = 'nvim_lsp' },