PYTHON: Project setup fixed and working, just need to add providers
This commit is contained in:
+29
-29
@@ -7,21 +7,19 @@ M.create_project = function(opts)
|
||||
default = "",
|
||||
completion = "filetype",
|
||||
}, function(ft)
|
||||
if ft ~= nil and vim.trim(ft) ~= "" then
|
||||
local ok, actions = pcall(require, "vern.actions." .. ft)
|
||||
local configs = require("vern.configs." .. ft)
|
||||
local args = vim.tbl_deep_extend("force", {}, configs, opts or {})
|
||||
if
|
||||
ok
|
||||
and actions
|
||||
and type(actions.create_project) == "function"
|
||||
then
|
||||
actions.create_project(args)
|
||||
else
|
||||
vim.notify("Unknown Filetype: " .. ft, vim.log.levels.WARN, {
|
||||
title = "Vern Project",
|
||||
})
|
||||
end
|
||||
ft = ft and vim.trim(ft)
|
||||
if not ft or vim.trim(ft) == "" then
|
||||
return
|
||||
end
|
||||
local ok, actions = pcall(require, "vern.actions." .. ft)
|
||||
local configs = require("vern.configs." .. ft)
|
||||
local args = vim.tbl_deep_extend("force", {}, configs, opts or {})
|
||||
if ok and actions and type(actions.create_project) == "function" then
|
||||
actions.create_project(args)
|
||||
else
|
||||
vim.notify("Unknown Filetype: " .. ft, vim.log.levels.WARN, {
|
||||
title = "Vern Project",
|
||||
})
|
||||
end
|
||||
end)
|
||||
end
|
||||
@@ -33,20 +31,22 @@ M.create_file = function(opts)
|
||||
default = "",
|
||||
completion = "filetype",
|
||||
}, function(ft)
|
||||
if ft ~= nil and vim.trim(ft) ~= "" then
|
||||
local ok, actions = pcall(require, "vern.actions." .. ft)
|
||||
local configs = require("vern.configs." .. ft)
|
||||
local args = vim.tbl_deep_extend("force", {}, configs, opts or {})
|
||||
if ok and actions and type(actions.create_file) == "function" then
|
||||
actions.create_file(args)
|
||||
else
|
||||
vim.notify("Unknown Filetype: " .. ft, vim.log.levels.WARN, {
|
||||
title = "Vern File",
|
||||
})
|
||||
vim.notify("Error: " .. actions, vim.log.levels.ERROR, {
|
||||
title = "Vern File",
|
||||
})
|
||||
end
|
||||
ft = ft and vim.trim(ft)
|
||||
if not ft or vim.trim(ft) == "" then
|
||||
return
|
||||
end
|
||||
local ok, actions = pcall(require, "vern.actions." .. ft)
|
||||
local configs = require("vern.configs." .. ft)
|
||||
local args = vim.tbl_deep_extend("force", {}, configs, opts or {})
|
||||
if ok and actions and type(actions.create_file) == "function" then
|
||||
actions.create_file(args)
|
||||
else
|
||||
vim.notify("Unknown Filetype: " .. ft, vim.log.levels.WARN, {
|
||||
title = "Vern File",
|
||||
})
|
||||
vim.notify("Error: " .. actions, vim.log.levels.ERROR, {
|
||||
title = "Vern File",
|
||||
})
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
+35
-71
@@ -1,84 +1,53 @@
|
||||
local M = {}
|
||||
|
||||
local utils = require("vern.utils")
|
||||
local render = require("vern.templates")
|
||||
local templates = require("vern.templates.python")
|
||||
local templates = require("vern.templates")
|
||||
|
||||
local join, get = vim.fs.joinpath, vim.tbl_get
|
||||
function M.create_project(opts)
|
||||
opts = opts or {}
|
||||
vim.ui.input({
|
||||
prompt = "Enter project name: ",
|
||||
default = "",
|
||||
}, function(pname)
|
||||
if not pname or vim.trim(pname) == "" then
|
||||
vim.ui.input({ prompt = "Enter project name: " }, function(pname)
|
||||
pname = pname and vim.trim(pname)
|
||||
if not pname or pname == "" then
|
||||
return
|
||||
end
|
||||
|
||||
pname = vim.trim(pname)
|
||||
|
||||
local configs = require("vern.configs")
|
||||
local pconfigs = require("vern.configs.python")
|
||||
|
||||
local cfg =
|
||||
vim.tbl_deep_extend("force", {}, configs, pconfigs, opts or {})
|
||||
local project_root = vim.fs.joinpath(
|
||||
vim.fn.expand(cfg.workspace_root),
|
||||
cfg.python.root,
|
||||
pname
|
||||
)
|
||||
local ctx = {
|
||||
project_name = pname,
|
||||
}
|
||||
local cfg = vim.tbl_deep_extend("force", {}, configs, pconfigs, opts or {})
|
||||
local ctx = { project_name = pname }
|
||||
local py = cfg.python
|
||||
|
||||
local dest = vim.tbl_get(cfg, "python", "templates", "project") or {}
|
||||
local root = join(vim.fn.expand(cfg.workspace_root), py.root, pname)
|
||||
vim.fn.mkdir(join(root, utils.fmt(py.source_root, ctx)), "p")
|
||||
|
||||
vim.fn.mkdir(
|
||||
vim.fs.joinpath(
|
||||
project_root,
|
||||
utils.fmt(cfg.python.source_root, ctx)
|
||||
),
|
||||
"p"
|
||||
)
|
||||
local function dump(dst, alt, tmpl)
|
||||
local full_path = vim.fs.joinpath(
|
||||
project_root,
|
||||
utils.fmt(vim.tbl_get(dest, dst, "target") or alt, ctx)
|
||||
)
|
||||
utils.dump(full_path, tmpl)
|
||||
return full_path
|
||||
local tmpl = get(py, "templates", "project") or {}
|
||||
local function dump(k, alt, id)
|
||||
local path = join(root, utils.fmt(get(tmpl, k, "target") or alt, ctx))
|
||||
utils.dump(path, templates.fetch("python", id, pname))
|
||||
return path
|
||||
end
|
||||
local bin =
|
||||
dump("bin", "src/{project_name}/main.py", templates.main(pname))
|
||||
dump("pkg", "src/{project_name}/__init__.py", templates.__init__(pname))
|
||||
dump("spec", "pyproject.toml", templates.pyproject(pname))
|
||||
|
||||
local bin = dump("bin", "src/{project_name}/main.py", "main")
|
||||
dump("pkg", "src/{project_name}/__init__.py", "__init__")
|
||||
dump("spec", "pyproject.toml", "pyproject")
|
||||
utils.init_git(root, "python")
|
||||
|
||||
vim.cmd.edit(vim.fn.fnameescape(bin))
|
||||
end)
|
||||
end
|
||||
|
||||
function M.create_file(opts)
|
||||
opts = opts or {}
|
||||
vim.ui.input({
|
||||
prompt = "Enter file name: ",
|
||||
default = "",
|
||||
}, function(fname)
|
||||
if fname ~= nil and vim.trim(fname) ~= "" then
|
||||
local loc = vim.tbl_get(
|
||||
opts,
|
||||
"python",
|
||||
"templates",
|
||||
"file",
|
||||
"module"
|
||||
).target or {}
|
||||
local context = {
|
||||
project_name = utils.get_project_name(),
|
||||
name = fname,
|
||||
}
|
||||
local rel_path = utils.fmt(loc, context)
|
||||
local path = vim.fs.joinpath(utils.get_project_root(), rel_path)
|
||||
utils.dump(path, templates.)
|
||||
vim.cmd("edit " .. utils.get_project_root() .. "/" .. rel_path)
|
||||
vim.ui.input({ prompt = "Enter file name: " }, function(fname)
|
||||
fname = fname and vim.trim(fname)
|
||||
if not fname or fname == "" then
|
||||
return
|
||||
end
|
||||
local root = get(opts, "python", "templates", "file", "module").target or {}
|
||||
local context = { project_name = utils.proj_name(), name = fname }
|
||||
local path = join(utils.proj_root(), utils.fmt(root, context))
|
||||
utils.dump(path, templates.fetch("python", "module", fname))
|
||||
vim.cmd.edit(vim.fn.expand(path))
|
||||
end)
|
||||
end
|
||||
|
||||
@@ -86,21 +55,19 @@ end
|
||||
---@param opts? table Takes a table for the runtime
|
||||
function M.run(opts)
|
||||
opts = opts or {}
|
||||
local root = utils.get_project_root() or "."
|
||||
local project_name = vim.fs.basename(root)
|
||||
local root = utils.proj_root() or "."
|
||||
local pname = vim.fs.basename(root)
|
||||
|
||||
local exe = opts.python.templates.project.bin.target or "src/%s/main.py"
|
||||
-- local rel_path = exe:find("%%s") and string.format(exe, project_name) or exe
|
||||
local rel_path = utils.fmt(exe, { project_name = project_name })
|
||||
local full_path = root .. "/" .. rel_path
|
||||
utils.terminal({ "python3 " .. full_path }, opts.terminal or {})
|
||||
local full_path = vim.fn.expand(root, utils.fmt(exe, { project_name = pname }))
|
||||
utils.term({ "python3 " .. full_path }, opts.terminal or {})
|
||||
end
|
||||
|
||||
---@param cmd_args? table Takes a table for the runtime
|
||||
function M.pip_install(opts, cmd_args)
|
||||
local args = cmd_args and cmd_args.args and vim.trim(cmd_args.args) or ""
|
||||
if args ~= "" then
|
||||
utils.terminal({ "pip install " .. args }, opts.terminal or {})
|
||||
utils.term({ "pip install " .. args }, opts.terminal or {})
|
||||
return
|
||||
end
|
||||
vim.ui.input({ prompt = "Enter pip module: " }, function(pip_module)
|
||||
@@ -108,10 +75,7 @@ function M.pip_install(opts, cmd_args)
|
||||
vim.notify("Pip Cancelled", vim.log.levels.WARN)
|
||||
return
|
||||
end
|
||||
utils.terminal(
|
||||
{ "pip install " .. vim.trim(pip_module) },
|
||||
opts.terminal or {}
|
||||
)
|
||||
utils.term({ "pip install " .. vim.trim(pip_module) }, opts.terminal or {})
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user