Made snippets better

lazy-lock.json

@@ -16,6 +16,7 @@
   "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" },
   "hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
   "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" },
+  "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },

lua/haelnorr/lazy/lsp.lua

@@ -1,6 +1,15 @@
 return {
 	"neovim/nvim-lspconfig",
 	dependencies = {
+		{
+			"folke/lazydev.nvim",
+			ft = "lua",
+			opts = {
+				library = {
+					{ path = "luvit-meta/library", words = { "vim%.uv" } },
+				},
+			},
+		},
 		"williamboman/mason.nvim",
 		"williamboman/mason-lspconfig.nvim",
 		"hrsh7th/cmp-nvim-lsp",
@@ -25,6 +34,7 @@ return {
 		require("fidget").setup({})
 		require("mason").setup()
 		require("mason-lspconfig").setup({
+			automatic_installation = false,
 			ensure_installed = {
 				"lua_ls",
 				"bashls",
@@ -103,7 +113,7 @@ return {
 				focusable = false,
 				style = "minimal",
 				border = "rounded",
-				source = "always",
+				source = true,
 				header = "",
 				prefix = "",
 			},

lua/haelnorr/lazy/luasnip.lua

@@ -17,10 +17,13 @@ return {
 			require("luasnip.loaders.from_" .. type).lazy_load()
 			vim.keymap.set("n", "<leader>ts", "<cmd>Telescope luasnip<CR>", { desc = "Search Snippets" })
 		end, { "vscode", "snipmate", "lua" })
-		local lua_snippets = require("haelnorr.snippets.lua")
-		ls.add_snippets("lua", lua_snippets)
-		local go_snippets = require("haelnorr.snippets.go")
-		ls.add_snippets("go", go_snippets)
+		for _, ft_path in ipairs(vim.api.nvim_get_runtime_file("lua/haelnorr/snippets/*.lua", true)) do
+			loadfile(ft_path)()
+		end
+		-- local lua_snippets = require("haelnorr.snippets.lua")
+		-- ls.add_snippets("lua", lua_snippets)
+		-- local go_snippets = require("haelnorr.snippets.go")
+		-- ls.add_snippets("go", go_snippets)
 		vim.keymap.set({ "i", "s" }, "<C-k>", function()
 			if ls.expand_or_jumpable() then
 				ls.expand_or_jump()

lua/haelnorr/lazy/refactoring.lua

@@ -6,7 +6,7 @@ return {
 	},
 	lazy = false,
 	config = function()
-		require("refactoring").setup()
+		require("refactoring").setup({})
 		vim.keymap.set("x", "<leader>re", ":Refactor extract ", { desc = "Extract selection" })
 		vim.keymap.set("x", "<leader>rf", ":Refactor extract_to_file ", { desc = "Extract selection to new file" })
 

lua/haelnorr/lazy/treesitter.lua

@@ -2,11 +2,18 @@ return {
 	"nvim-treesitter/nvim-treesitter",
 	build = ":TSUpdate",
 	config = function()
+		---@diagnostic disable-next-line: missing-fields
 		require("nvim-treesitter.configs").setup({
 			-- A list of parser names, or "all"
 			ensure_installed = {
-                "vimdoc", "javascript", "typescript", "c", "lua", "rust",
-                "jsdoc", "bash",
+				"vimdoc",
+				"javascript",
+				"typescript",
+				"c",
+				"lua",
+				"go",
+				"bash",
+				"templ",
 			},
 
 			-- Install parsers synchronously (only applied to `ensure_installed`)
@@ -17,7 +24,7 @@ return {
 			auto_install = true,
 
 			indent = {
-                enable = true
+				enable = true,
 			},
 
 			highlight = {
@@ -32,15 +39,13 @@ return {
 			},
 		})
 
-        local treesitter_parser_config = require("nvim-treesitter.parsers").get_parser_configs()
-        treesitter_parser_config.templ = {
-            install_info = {
-                url = "https://github.com/vrischmann/tree-sitter-templ.git",
-                files = {"src/parser.c", "src/scanner.c"},
-                branch = "master",
-            },
+		-- local treesitter_parser_config = require("nvim-treesitter.parsers").get_parser_configs()
+		-- treesitter_parser_config.templ = {
+		-- 	install_info = {
+		-- 		url = "https://github.com/vrischmann/tree-sitter-templ.git",
+		-- 		files = { "src/parser.c", "src/scanner.c" },
+		-- 		branch = "master",
+		-- 	},
+		-- }
+	end,
 }
-
-    end
-}
-

lua/haelnorr/lazy/which-key.lua

@@ -22,7 +22,13 @@ return {
 
 			{ "<leader><leader>", group = "Reload Plugins", icon = { icon = "" } },
 			{ "<leader><leader>w", "<cmd>Lazy reload which-key.nvim<CR>", desc = "Reload Which-key" },
-			{ "<leader><leader>s", "<cmd>Lazy reload LuaSnip<CR>", desc = "Reload LuaSnip" },
+			{
+				"<leader><leader>s",
+				"<cmd>source ~/.config/nvim/lua/haelnorr/snippets/lua.lua<CR>\
+				<cmd>source ~/.config/nvim/lua/haelnorr/snippets/go.lua<CR>\
+                <cmd>Lazy reload LuaSnip<CR>",
+				desc = "Reload LuaSnip",
+			},
 			{ "<leader><leader>l", "<cmd>Lazy reload nvim-lspconfig<CR>", desc = "Reload LSP" },
 
 			-- Harpoon

lua/haelnorr/snippets/go.lua

@@ -1,31 +1,149 @@
+require("luasnip.session.snippet_collection").clear_snippets("go")
 local ls = require("luasnip")
 local s = ls.snippet
-local t = ls.text_node
-local i = ls.insert_node
 local c = ls.choice_node
-local f = ls.function_node
-local fmt = require("luasnip.extras.fmt").fmt
-return {
+local d = ls.dynamic_node
+local i = ls.insert_node
+local t = ls.text_node
+local sn = ls.snippet_node
+local rep = require("luasnip.extras").rep
+local fmta = require("luasnip.extras.fmt").fmta
+
+local default_values = {
+	int = "0",
+	bool = "false",
+	string = '""',
+
+	error = function(_, info)
+		if info then
+			info.index = info.index + 1
+
+			return c(info.index, {
+				t(info.err_name),
+				t(string.format('errors.Wrap(%s, "%s")', info.err_name, info.func_name)),
+			})
+		else
+			return t("err")
+		end
+	end,
+
+	[function(text)
+		return string.find(text, "*", 1, true) ~= nil
+	end] = function(_, _)
+		return t("nil")
+	end,
+
+	[function(text)
+		return not string.find(text, "*", 1, true) and string.upper(string.sub(text, 1, 1)) == string.sub(text, 1, 1)
+	end] = function(text, info)
+		info.index = info.index + 1
+		return c(info.index, {
+			t(text .. "{}"),
+			t(text),
+		})
+	end,
+}
+
+local transform = function(text, info)
+	local condition_matches = function(condition, ...)
+		if type(condition) == "string" then
+			return condition == text
+		else
+			return condition(...)
+		end
+	end
+	for condition, result in pairs(default_values) do
+		if condition_matches(condition, text, info) then
+			if type(result) == "string" then
+				return t(result)
+			else
+				return result(text, info)
+			end
+		end
+	end
+
+	return t(text)
+end
+
+local handlers = {
+	parameter_list = function(node, info)
+		local result = {}
+		local count = node:named_child_count()
+		for idx = 0, count - 1 do
+			local matching_node = node:named_child(idx)
+			local type_node = matching_node:field("type")[1]
+			table.insert(result, transform(vim.treesitter.get_node_text(type_node, 0), info))
+			if idx ~= count - 1 then
+				table.insert(result, t({ ", " }))
+			end
+		end
+		return result
+	end,
+
+	type_indentifier = function(node, info)
+		local text = vim.treesitter.get_node_text(node, 0)
+		return { transform(text, info) }
+	end,
+}
+
+local function go_result_type(info)
+	local function_node_types = {
+		function_declaration = true,
+		method_declaration = true,
+		func_literal = true,
+	}
+
+	local node = vim.treesitter.get_node()
+	while node ~= nil do
+		if function_node_types[node:type()] then
+			break
+		end
+		node = node:parent()
+	end
+	if not node then
+		vim.notify("Not inside of a function")
+		return (t(""))
+	end
+
+	local query = assert(vim.treesitter.query.get("go", "return-snippet"), "No query")
+	for _, capture in query:iter_captures(node, 0) do
+		if handlers[capture:type()] then
+			return handlers[capture:type()](capture, info)
+		end
+	end
+end
+
+local go_return_values = function(args)
+	return sn(
+		nil,
+		go_result_type({
+			index = 0,
+			err_name = args[1][1],
+			func_name = args[2][1],
+		})
+	)
+end
+
+ls.add_snippets("go", {
 	s(
 		"efi",
-		fmt(
+		fmta(
 			[[
-                {}, err := {}({})
-                if err != nil {{
-                    return "", false, {}
-                }}
+<val>, <err> := <f>(<args>)
+if <err_same> != nil {
+    return <result>
+}
+<finish>
 ]],
 			{
-				i(1, "var"),
-				i(2, "f"),
-				i(3, ""),
-				c(4, {
-					f(function(args)
-						return 'errors.Wrap(err, "' .. args[1][1] .. '")'
-					end, { 2 }),
-					t("err"),
-				}),
+				val = i(1),
+				err = i(2, "err"),
+				f = i(3),
+				args = i(4),
+				err_same = rep(2),
+				result = d(5, go_return_values, { 2, 3 }),
+				finish = i(0),
 			}
 		)
 	),
-}
+})

lua/haelnorr/snippets/lua.lua

@@ -1,14 +1,41 @@
+require("luasnip.session.snippet_collection").clear_snippets("lua")
 local ls = require("luasnip")
 local s = ls.snippet
+local c = ls.choice_node
 local i = ls.insert_node
-local fmt = require("luasnip.extras.fmt").fmt
-return {
+local fmta = require("luasnip.extras.fmt").fmta
+ls.add_snippets("lua", {
 	s(
 		"snip",
-		fmt('s("{}", fmt(\n    "{}"\n, {{\n    {}\n}})),', {
-			i(1, "trigger"),
-			i(2, "snippet body"),
-			i(3, "insert nodes"),
-		})
-	),
+		fmta(
+			[=[
+s("<trigger>",
+    fmta(
+[[
+<snippet>
+]],
+        {
+            <node_choice>
         }
+    )
+),<finish>
+]=],
+			{
+				trigger = i(1),
+				snippet = i(2),
+				node_choice = c(3, {
+					fmta([[<node> = <node_type>(1, "<node_placeholder>"),]], {
+						node = i(1),
+						node_type = i(2, "type"),
+						node_placeholder = i(3, "placeholder"),
+					}),
+					fmta("<node> = <node_type>(1)", {
+						node = i(1),
+						node_type = i(2, "type"),
+					}),
+				}),
+				finish = i(0),
+			}
+		)
+	),
+})

queries/go/return-snippet.scm

@@ -0,0 +1,3 @@
+[(method_declaration result: (_) @type)
+ (function_declaration result: (_) @type)
+ (func_literal result: (_) @type)]