From 56288981105b36089d1abebebefd195e6f6385f4 Mon Sep 17 00:00:00 2001 From: srdusr Date: Tue, 16 May 2023 16:22:08 +0200 Subject: Add snippets.lua --- lua/plugins/snippets.lua | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 lua/plugins/snippets.lua diff --git a/lua/plugins/snippets.lua b/lua/plugins/snippets.lua new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3 From 414c6b7e5a0bde6c0af21ed2d545313d627b53b3 Mon Sep 17 00:00:00 2001 From: srdusr Date: Tue, 16 May 2023 16:23:22 +0200 Subject: Add configuration for snippets --- lua/plugins/snippets.lua | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lua/plugins/snippets.lua b/lua/plugins/snippets.lua index e69de29..104bda8 100644 --- a/lua/plugins/snippets.lua +++ b/lua/plugins/snippets.lua @@ -0,0 +1,23 @@ +return { + { + "L3MON4D3/LuaSnip", + opts = { + history = true, + -- Allow autotrigger snippets + enable_autosnippets = true, + -- For equivalent of UltiSnips visual selection + store_selection_keys = "", + -- Event on which to check for exiting a snippet's region + region_check_events = "InsertEnter", + -- ejmastnak uses InsertLeave, perhaps because he has history=false + delete_check_events = "TextChanged", + -- When to trigger update of active nodes' dependents, e.g. repeat nodes + update_events = "TextChanged,TextChangedI", + }, + config = function(_, opts) + require("luasnip").setup(opts) + -- TODO: better way to detect this relative to config dir? + require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets/" }) + end, + }, +} -- cgit v1.2.3 From 1e7b1470a48c00f04b266a4e5031c04633bd5a3d Mon Sep 17 00:00:00 2001 From: srdusr Date: Wed, 17 May 2023 23:28:13 +0200 Subject: Changed luasnip to snippets --- init.lua | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/init.lua b/init.lua index b9c54c0..8c146b0 100644 --- a/init.lua +++ b/init.lua @@ -64,35 +64,34 @@ local modules = { "user.opts", -- Options "user.keys", -- Keymaps "user.mods", -- Modules/functions - --"user.deps", -- Plugins --"user.scripts", - "plugins.colorscheme", "plugins.treesitter", "plugins.neodev", + "plugins.colorscheme", "plugins.telescope", "plugins.nvim-tree", - "plugins.quickfix", + "plugins.web-devicons", "plugins.cmp", - "plugins.luasnip", + "plugins.quickfix", + "plugins.snippets", "plugins.colorizer", "plugins.prettier", --"plugins.git", + "plugins.lsp", "plugins.gitsigns", "plugins.neoscroll", - "plugins.lsp", "plugins.statuscol", + "plugins.trouble", "plugins.goto-preview", "plugins.autopairs", "plugins.navic", + "plugins.toggleterm", "plugins.zen-mode", "plugins.fidget", - "plugins.web-devicons", - "plugins.heirline", + "plugins.dap", "plugins.neotest", - "plugins.toggleterm", - "plugins.trouble", + "plugins.heirline", "plugins.dashboard", - "plugins.dap", } -- cgit v1.2.3 From 79166b0310c2f652958a7d52ed1fbd76333bfa4e Mon Sep 17 00:00:00 2001 From: srdusr Date: Wed, 17 May 2023 23:31:44 +0200 Subject: Deleted luasnip.lua --- lua/plugins/luasnip.lua | 64 ------------------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 lua/plugins/luasnip.lua diff --git a/lua/plugins/luasnip.lua b/lua/plugins/luasnip.lua deleted file mode 100644 index 4cceed1..0000000 --- a/lua/plugins/luasnip.lua +++ /dev/null @@ -1,64 +0,0 @@ -local ls = require "luasnip" -- - -require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets/" }) ---local options = { -ls.config.set_config { - history = true, - updateevents = "TextChanged,TextChangedI", - -- Autosnippets: - enable_autosnippets = true, -- - ext_opts = { -- - [require("luasnip.util.types").choiceNode] = { - active = { - virt_text = { { "«", "GruvboxOrange" } }, - }, - }, - }, -} - ---local keymap = vim.keymap ---local keymap = vim.api.nvim_set_keymap -local keymap = vim.keymap.set ---keymap('i', '', 'luasnip#expand_or_jumpable() ? "luasnip-expand-or-jump" : ""', {expr = true, silent = true}) -keymap({ "i", "s"}, "", function() - if ls.expand_or_jumpable() then - ls.expand() - end -end) - -keymap({ "i", "s"}, "", function() - if ls.jumpable(1) then - ls.jump(1) - end -end) - -keymap({ "i", "s"}, "", function() - if ls.jumpable(-1) then - ls.jump(-1) - end -end) - -keymap({ "i", "s"}, "", function() - if ls.choice_active() then - ls.change_choice(1) - end -end) - -keymap({ "i", "s"}, "", function() - if ls.choice_active() then - ls.change_choice(-1) - end -end) - --- Character class Matching --- %a letters (A-Z, a-z) --- %c control characters (\n, \t, \r, ...) --- %d digits (0-9) --- %l lower-case letter (a-z) --- %p punctuation characters (!, ?, &, ...) --- %s space characters --- %u upper-case letters --- %w alphanumeric characters (A-Z, a-z, 0-9) --- %x hexadecimal digits (\3, \4, ...) --- %z the character with representation 0 --- . Matches any character -- cgit v1.2.3 From 12573adf414a0074d79a333bac4961c3a78ea176 Mon Sep 17 00:00:00 2001 From: srdusr Date: Wed, 17 May 2023 23:32:04 +0200 Subject: Add old luasnip configuration to here --- lua/plugins/snippets.lua | 85 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 65 insertions(+), 20 deletions(-) diff --git a/lua/plugins/snippets.lua b/lua/plugins/snippets.lua index 104bda8..7df6b2f 100644 --- a/lua/plugins/snippets.lua +++ b/lua/plugins/snippets.lua @@ -1,23 +1,68 @@ -return { - { - "L3MON4D3/LuaSnip", - opts = { - history = true, - -- Allow autotrigger snippets - enable_autosnippets = true, - -- For equivalent of UltiSnips visual selection - store_selection_keys = "", - -- Event on which to check for exiting a snippet's region - region_check_events = "InsertEnter", - -- ejmastnak uses InsertLeave, perhaps because he has history=false - delete_check_events = "TextChanged", - -- When to trigger update of active nodes' dependents, e.g. repeat nodes - update_events = "TextChanged,TextChangedI", +local ls = require "luasnip" -- + +require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets/" }) +--local options = { +ls.config.set_config { + history = true, + updateevents = "TextChanged,TextChangedI", + -- Autosnippets: + enable_autosnippets = true, -- + region_check_events = "InsertEnter", + delete_check_events = "TextChanged", + update_events = "TextChanged,TextChangedI", + store_selection_keys = "", + ext_opts = { -- + [require("luasnip.util.types").choiceNode] = { + active = { + virt_text = { { "«", "GruvboxOrange" } }, + }, }, - config = function(_, opts) - require("luasnip").setup(opts) - -- TODO: better way to detect this relative to config dir? - require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets/" }) - end, }, } + +--local keymap = vim.keymap +--local keymap = vim.api.nvim_set_keymap +local keymap = vim.keymap.set +--keymap('i', '', 'luasnip#expand_or_jumpable() ? "luasnip-expand-or-jump" : ""', {expr = true, silent = true}) +keymap({ "i", "s"}, "", function() + if ls.expand_or_jumpable() then + ls.expand() + end +end) + +keymap({ "i", "s"}, "", function() + if ls.jumpable(1) then + ls.jump(1) + end +end) + +keymap({ "i", "s"}, "", function() + if ls.jumpable(-1) then + ls.jump(-1) + end +end) + +keymap({ "i", "s"}, "", function() + if ls.choice_active() then + ls.change_choice(1) + end +end) + +keymap({ "i", "s"}, "", function() + if ls.choice_active() then + ls.change_choice(-1) + end +end) + +-- Character class Matching +-- %a letters (A-Z, a-z) +-- %c control characters (\n, \t, \r, ...) +-- %d digits (0-9) +-- %l lower-case letter (a-z) +-- %p punctuation characters (!, ?, &, ...) +-- %s space characters +-- %u upper-case letters +-- %w alphanumeric characters (A-Z, a-z, 0-9) +-- %x hexadecimal digits (\3, \4, ...) +-- %z the character with representation 0 +-- . Matches any character -- cgit v1.2.3