refactor: continuation of compressing languages to be agnostic

lua/vern-nvim/actions/c.lua

@@ -1,9 +1,6 @@
 local M = {}
 
 local utils = require("vern-nvim.utils")
-local templates = require("vern-nvim.templates")
-
-local join = vim.fs.joinpath
 
 ---@param root string
 M.create_project = function(root)
@@ -12,42 +9,36 @@ M.create_project = function(root)
 end
 
 ---@param opts VernCConfig
-function M.create_file(opts)
+M.create_file = function(opts)
+    opts = opts or {}
     vim.ui.input({ prompt = "Enter type (c/h): " }, function(ft)
         ft = ft and vim.trim(ft)
         if not ft or ft == "" then
             return
         end
-        local configs = require("vern-nvim.configs.c")
+        local mod = {}
-        ---@type VernCConfig
+        if ft == "c" then
-        local cfg = vim.tbl_deep_extend("force", {}, configs, opts or {})
+            mod = opts.c.templates.file.source or {}
+        end
+        if ft == "h" then
+            mod = opts.c.templates.file.header or {}
+        end
         vim.ui.input({ prompt = "Enter file name: " }, function(fname)
-            local root = join(vim.fn.expand(cfg.workspace_root), cfg.c.root, utils.proj_name())
+            fname = fname and vim.trim(fname)
-            local input_txt = fname
+            if not fname or fname == "" then
-            ft = ft and vim.trim(ft)
-            if not ft or ft == "" then
                 return
             end
-            local mod
+
-            if ft == "c" then
+            local raw_path = vim.fs.joinpath(mod.path, mod.name)
-                mod = cfg.c.templates.file.source or {}
-            end
-            if ft == "h" then
-                mod = cfg.c.templates.file.header or {}
-                input_txt = fname:upper()
-            end
-            local raw_path = join(mod.path, mod.name)
             local context = { project_name = utils.proj_name(), name = fname }
-            local path = utils.resolve_path(raw_path, cfg.c.dirs or {}, context)
+            local path = utils.resolve_path(raw_path, opts.c.dirs or {}, context)
-            local abs_file_path = vim.fs.normalize(join(root, path))
+            local root = utils.proj_root()
-            if ft == "h" then
+            utils.dump(
-                local abs_dir_path = vim.fs.dirname(abs_file_path)
+                vim.fs.joinpath(root, path),
-                if abs_dir_path ~= root and not vim.startswith(root, abs_dir_path) then
+                require("vern-nvim.templates").fetch(mod.kind_path, mod.kind, fname)
-                    vim.fn.mkdir(abs_dir_path, "p")
+            )
-                end
+            vim.cmd.edit(vim.fn.expand(path))
-            end
+            vim.notify(fname .. " has been created!", vim.log.levels.INFO, { title = "Vern File" })
-            utils.dump(abs_file_path, templates.fetch(mod.kind_path, mod.kind, input_txt))
-            vim.cmd.edit(vim.fn.expand(abs_file_path))
         end)
     end)
 end

lua/vern-nvim/actions/cpp.lua

@@ -8,23 +8,38 @@ M.create_project = function(root)
     local _ = vim.system({ "sh", "-c", build_cmd }):wait()
 end
 
----@param opts VernLanguageTemplates
+---@param opts VernCPPConfig
-M.create_file = function(opts, callback)
+M.create_file = function(opts)
+    opts = opts or {}
     vim.ui.input({ prompt = "Enter type (c/h): " }, function(ft)
         ft = ft and vim.trim(ft)
         if not ft or ft == "" then
             return
         end
-        local template = {}
+        local mod = {}
         if ft == "c" then
-            template = opts.file.source or {}
+            mod = opts.cpp.templates.file.source or {}
         end
         if ft == "h" then
-            template = opts.file.header or {}
+            mod = opts.cpp.templates.file.header or {}
         end
-        if callback then
+        vim.ui.input({ prompt = "Enter file name: " }, function(fname)
-            callback(template)
+            fname = fname and vim.trim(fname)
+            if not fname or fname == "" then
+                return
             end
+
+            local raw_path = vim.fs.joinpath(mod.path, mod.name)
+            local context = { project_name = utils.proj_name(), name = fname }
+            local path = utils.resolve_path(raw_path, opts.cpp.dirs or {}, context)
+            local root = utils.proj_root()
+            utils.dump(
+                vim.fs.joinpath(root, path),
+                require("vern-nvim.templates").fetch(mod.kind_path, mod.kind, fname)
+            )
+            vim.cmd.edit(vim.fn.expand(path))
+            vim.notify(fname .. " has been created!", vim.log.levels.INFO, { title = "Vern File" })
+        end)
     end)
 end
 

lua/vern-nvim/actions/init.lua

@@ -69,31 +69,17 @@ M.create_file = function(opts)
                 return
             end
 
-            local function continue_creation(mod)
+            local mod
-                mod = mod or args[ft].templates.file.source or {}
+            if ok and actions and type(actions.create_file) == "function" then
-                if vim.tbl_isempty(mod) then
+                mod = actions.create_file(args[ft]) or args[ft].templates.file.source or {}
-                    return
             end
             local raw_path = vim.fs.joinpath(mod.path, mod.name)
             local context = { project_name = utils.proj_name(), name = fname }
             local path = utils.resolve_path(raw_path, args[ft].dirs or {}, context)
             local root = utils.proj_root()
-                utils.dump(
+            utils.dump(vim.fs.joinpath(root, path), templates.fetch(mod.kind_path, mod.kind, fname))
-                    vim.fs.joinpath(root, path),
-                    templates.fetch(mod.kind_path, mod.kind, fname)
-                )
             vim.cmd.edit(vim.fn.expand(path))
-                vim.notify(
+            vim.notify(fname .. " has been created!", vim.log.levels.INFO, { title = "Vern File" })
-                    fname .. " has been created!",
-                    vim.log.levels.INFO,
-                    { title = "Vern File" }
-                )
-            end
-            if ok and actions and type(actions.create_file) == "function" then
-                actions.create_file(args[ft].templates, continue_creation)
-            else
-                continue_creation(nil)
-            end
         end)
     end)
 end

lua/vern-nvim/attach/c.lua

@@ -1,4 +1,3 @@
-local actions = require("vern-nvim.actions.c")
 local config = require("vern-nvim.configs.c")
 
 ---@param bufnr integer Buffer to activate on : defaults to 0
@@ -6,14 +5,11 @@ local config = require("vern-nvim.configs.c")
 return function(bufnr, user_opts)
     ---@type VernCConfig
     local opts = vim.tbl_deep_extend("force", {}, config, user_opts or {})
-    vim.api.nvim_buf_create_user_command(bufnr, "CRun", function()
-        if type(actions.run) == "function" then
-            actions.run(opts)
-        end
-    end, { desc = "Run c project" })
-
     for key, def in pairs(opts.c.keybinds or {}) do
         if type(def.action) == "function" then
+            vim.api.nvim_buf_create_user_command(bufnr, def.user_command, function()
+                def.action(opts)
+            end, { nargs = "*", desc = def.desc })
             vim.keymap.set("n", key, function()
                 def.action(opts)
             end, {

lua/vern-nvim/attach/cpp.lua

@@ -1,4 +1,3 @@
-local actions = require("vern-nvim.actions.cpp")
 local config = require("vern-nvim.configs.cpp")
 
 ---@param bufnr integer Buffer to activate on : defaults to 0
@@ -6,14 +5,11 @@ local config = require("vern-nvim.configs.cpp")
 return function(bufnr, user_opts)
     ---@type VernCPPConfig
     local opts = vim.tbl_deep_extend("force", {}, config, user_opts or {})
-    vim.api.nvim_buf_create_user_command(bufnr, "CPPRun", function()
-        if type(actions.run) == "function" then
-            actions.run(opts)
-        end
-    end, { desc = "Run cpp project" })
-
     for key, def in pairs(opts.cpp.keybinds or {}) do
         if type(def.action) == "function" then
+            vim.api.nvim_buf_create_user_command(bufnr, def.user_command, function()
+                def.action(opts)
+            end, { nargs = "*", desc = def.desc })
             vim.keymap.set("n", key, function()
                 def.action(opts)
             end, {

lua/vern-nvim/attach/lua.lua

@@ -1,4 +1,3 @@
-local actions = require("vern-nvim.actions.lua")
 local config = require("vern-nvim.configs.lua")
 
 ---@param bufnr integer Buffer to activate on : defaults to 0
@@ -6,14 +5,11 @@ local config = require("vern-nvim.configs.lua")
 return function(bufnr, user_opts)
     ---@type VernLuaConfig
     local opts = vim.tbl_deep_extend("force", {}, config, user_opts or {})
-    vim.api.nvim_buf_create_user_command(bufnr, "LuaRun", function()
-        if type(actions.run) == "function" then
-            actions.run(opts)
-        end
-    end, { desc = "Run lua project" })
-
     for key, def in pairs(opts.lua.keybinds or {}) do
         if type(def.action) == "function" then
+            vim.api.nvim_buf_create_user_command(bufnr, def.user_command, function()
+                def.action(opts)
+            end, { nargs = "*", desc = def.desc })
             vim.keymap.set("n", key, function()
                 def.action(opts)
             end, {

lua/vern-nvim/attach/python.lua

@@ -1,4 +1,3 @@
-local actions = require("vern-nvim.actions.python")
 local config = require("vern-nvim.configs.python")
 
 ---@param bufnr integer Buffer to activate on : defaults to 0
@@ -6,20 +5,11 @@ local config = require("vern-nvim.configs.python")
 return function(bufnr, user_opts)
     ---@type VernPythonConfig
     local opts = vim.tbl_deep_extend("force", {}, config, user_opts or {})
-    vim.api.nvim_buf_create_user_command(bufnr, "Pythonrun", function()
-        if type(actions.run) == "function" then
-            actions.run(opts)
-        end
-    end, { desc = "Run python project" })
-
-    vim.api.nvim_buf_create_user_command(bufnr, "Pythonpip", function()
-        if actions.pip_install then
-            actions.pip_install()
-        end
-    end, { nargs = "*", desc = "Install python packages" })
-
     for key, def in pairs(opts.python.keybinds or {}) do
         if type(def.action) == "function" then
+            vim.api.nvim_buf_create_user_command(bufnr, def.user_command, function()
+                def.action(opts)
+            end, { nargs = "*", desc = def.desc })
             vim.keymap.set("n", key, function()
                 def.action(opts)
             end, {

lua/vern-nvim/configs/c.lua

@@ -9,10 +9,12 @@ M.c = {
     },
     keybinds = {
         ["<leader>pr"] = {
+            user_command = "CRun",
             desc = "Executes c code",
             action = require("vern-nvim.actions.c").run,
         },
         ["<leader>pf"] = {
+            user_command = "CCreateFile",
             desc = "Creates source/header files",
             action = require("vern-nvim.actions.c").create_file,
         },

lua/vern-nvim/configs/cpp.lua

@@ -9,10 +9,12 @@ M.cpp = {
     },
     keybinds = {
         ["<leader>pr"] = {
+            user_command = "CPPRun",
             desc = "Executes cpp code",
             action = require("vern-nvim.actions.cpp").run,
         },
         ["<leader>pf"] = {
+            user_command = "CPPCreateFile",
             desc = "Creates source/header files",
             action = require("vern-nvim.actions.cpp").create_file,
         },
@@ -47,7 +49,7 @@ M.cpp = {
             },
             source = {
                 path = "{dirs.src}",
-                name = "{name}.c",
+                name = "{name}.cpp",
                 kind = "source",
                 kind_path = "vern-nvim.templates.cpp",
             },
@@ -57,7 +59,7 @@ M.cpp = {
                 path = ".",
                 name = ".clang-tidy",
                 kind = "linter",
-                kind_path = "vern-nvim.templates.c",
+                kind_path = "vern-nvim.templates.cpp",
                 enabled = false,
             },
         },

lua/vern-nvim/configs/init.lua

@@ -5,10 +5,12 @@ return {
     workspace_root = "~/personal/Projects",
     keybinds = {
         ["<leader>pc"] = {
+            user_command = "VernCreateProject",
             desc = "Creates a new project",
             action = actions.create_project,
         },
         ["<leader>pf"] = {
+            user_command = "VernCreateFile",
             desc = "Creates a new project file",
             action = actions.create_file,
         },

lua/vern-nvim/configs/lua.lua

@@ -8,6 +8,7 @@ M.lua = {
     },
     keybinds = {
         ["<leader>pr"] = {
+            user_command = "LuaRun",
             desc = "Executes lua code",
             action = require("vern-nvim.actions.lua").run,
         },

lua/vern-nvim/configs/python.lua

@@ -8,11 +8,13 @@ M.python = {
     },
     keybinds = {
         ["<leader>pr"] = {
+            user_command = "Pythonrun",
             desc = "Executes python code",
             action = require("vern-nvim.actions.python").run,
         },
         ["<leader>pi"] = {
-            desc = "Asks for what python package to install",
+            user_command = "Pythonpip",
+            desc = "Install python packages for environment",
             action = require("vern-nvim.actions.python").pip_install,
         },
     },

lua/vern-nvim/init.lua

@@ -1,7 +1,6 @@
 local M = {}
 
 local configs = require("vern-nvim.configs")
-local actions = require("vern-nvim.actions")
 
 ---@type VernCoreConfig
 M.opts = vim.deepcopy(configs)
@@ -18,6 +17,9 @@ function M.setup(user_opts)
 
     for key, def in pairs(M.opts.keybinds or {}) do
         if type(def.action) == "function" then
+            vim.api.nvim_create_user_command(def.user_command, function()
+                def.action(M.opts)
+            end, { nargs = "*", desc = def.desc })
             vim.keymap.set("n", key, function()
                 def.action(M.opts)
             end, {
@@ -27,18 +29,6 @@ function M.setup(user_opts)
         end
     end
 
-    vim.api.nvim_create_user_command("VernCreateProject", function()
-        if actions.create_project then
-            actions.create_project(M.opts)
-        end
-    end, { nargs = "*", desc = "Create a new project" })
-
-    vim.api.nvim_create_user_command("VernCreateFile", function()
-        if type(actions.create_file) == "function" then
-            actions.create_file(M.opts)
-        end
-    end, { nargs = "*", desc = "Creates a new file for project" })
-
     local group = vim.api.nvim_create_augroup("VernAutocommands", { clear = true })
     vim.api.nvim_create_autocmd("FileType", {
         group = group,

lua/vern-nvim/types.lua

@@ -3,6 +3,7 @@
 ---@alias SplitAnchorType "right" | "bottom"
 
 ---@class VernKeybindItem
+---@field user_command string
 ---@field desc string
 ---@field action function