diff --git a/lua/vern-nvim/actions/utils.lua b/lua/vern-nvim/actions/utils.lua index 0cc0f77..21c4a0e 100644 --- a/lua/vern-nvim/actions/utils.lua +++ b/lua/vern-nvim/actions/utils.lua @@ -3,8 +3,6 @@ local M = {} local utils = require("vern-nvim.utils") local templates = require("vern-nvim.templates") -local join = vim.fs.joinpath - ---@param cfg table Language config ---@param pname string Name of project ---@param root string Project location @@ -13,20 +11,20 @@ function M.create(cfg, pname, root) local ctx = { project_name = pname } vim.fn.mkdir(root, "p") - local bin for _, dir in pairs(cfg.dirs) do - local path = vim.fs.normalize(join(root, utils.fmt(dir, ctx))) + local path = vim.fs.normalize(vim.fs.joinpath(root, utils.fmt(dir, ctx))) vim.fn.mkdir(path, "p") end + local bin for tbl_name, tbl in pairs(cfg.templates.project) do - local raw_path = join(tbl.path, tbl.name) + local raw_path = vim.fs.joinpath(tbl.path, tbl.name) local path = utils.resolve_path(raw_path, cfg.dirs, ctx) if tbl_name == "primary" then - bin = join(root, path) + bin = vim.fs.joinpath(root, path) end - local abs_file_path = vim.fs.normalize(join(root, path)) + local abs_file_path = vim.fs.normalize(vim.fs.joinpath(root, path)) local abs_dir_path = vim.fs.dirname(abs_file_path) if abs_dir_path ~= root and not vim.startswith(root, abs_dir_path) then vim.fn.mkdir(abs_dir_path, "p") @@ -35,9 +33,9 @@ function M.create(cfg, pname, root) end for _, tbl in pairs(cfg.templates.extras) do if tbl.enabled then - local raw_path = join(tbl.path, tbl.name) + local raw_path = vim.fs.joinpath(tbl.path, tbl.name) local path = utils.resolve_path(raw_path, cfg.dirs, ctx) - local abs_file_path = vim.fs.normalize(join(root, path)) + local abs_file_path = vim.fs.normalize(vim.fs.joinpath(root, path)) local abs_dir_path = vim.fs.dirname(abs_file_path) if abs_dir_path ~= root and not vim.startswith(root, abs_dir_path) then vim.fn.mkdir(abs_dir_path, "p")