Added Lua opts and made sure python works. Terminal doesnt work
This commit is contained in:
@@ -6,7 +6,12 @@ M.defaults = {
|
|||||||
keybinds = {
|
keybinds = {
|
||||||
["<leader>pr"] = "PythonRun",
|
["<leader>pr"] = "PythonRun",
|
||||||
["<leader>pb"] = "PythonPip",
|
["<leader>pb"] = "PythonPip",
|
||||||
["<leader>pc"] = "PythonCustom"
|
},
|
||||||
|
},
|
||||||
|
lua = {
|
||||||
|
project_root = "~/Projects/Lua",
|
||||||
|
keybinds = {
|
||||||
|
["<leader>pr"] = "LuaRun",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
terminal = {
|
terminal = {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ local M = {}
|
|||||||
|
|
||||||
M.loaded_languages = {}
|
M.loaded_languages = {}
|
||||||
M.config = require("Polydev.configs")
|
M.config = require("Polydev.configs")
|
||||||
|
M.utils = require("Polydev.utils")
|
||||||
M.java = require("Polydev.languages.java")
|
M.java = require("Polydev.languages.java")
|
||||||
M.c = require("Polydev.languages.c")
|
M.c = require("Polydev.languages.c")
|
||||||
M.cpp = require("Polydev.languages.cpp")
|
M.cpp = require("Polydev.languages.cpp")
|
||||||
|
|||||||
@@ -1,13 +1,22 @@
|
|||||||
local M = {}
|
|
||||||
local utils = require("Polydev.utils")
|
local utils = require("Polydev.utils")
|
||||||
|
local config = require("Polydev.configs")
|
||||||
|
local M = {}
|
||||||
|
|
||||||
M.lua_run = nil
|
M.keybinds = {}
|
||||||
M.config = {
|
M.opts = nil
|
||||||
project_root = "~/Projects/Lua",
|
|
||||||
keybinds = {
|
function M.setup(opts)
|
||||||
["<leader>pr"] = "LuaRun",
|
M.opts = vim.tbl_deep_extend("force", {}, config.get("lua"), opts or {})
|
||||||
},
|
for key, command in pairs(M.opts.keybinds) do
|
||||||
}
|
M.keybinds[command] = key
|
||||||
|
end
|
||||||
|
|
||||||
|
vim.api.nvim_create_user_command("LuaRun", M.run, {})
|
||||||
|
|
||||||
|
if M.keybinds.LuaRun then
|
||||||
|
vim.keymap.set("n", M.keybinds.LuaRun, ":LuaRun<CR>", { silent = true })
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function M.get_project_root()
|
function M.get_project_root()
|
||||||
local dir = vim.fn.expand("%:p:h")
|
local dir = vim.fn.expand("%:p:h")
|
||||||
@@ -26,20 +35,10 @@ function M.get_project_name()
|
|||||||
return polydev_file:match("([^/]+)%.polydev$")
|
return polydev_file:match("([^/]+)%.polydev$")
|
||||||
end
|
end
|
||||||
|
|
||||||
function M.setup(opts)
|
|
||||||
M.config = vim.tbl_deep_extend("force", M.config, opts or {})
|
|
||||||
for key, command in pairs(M.config.keybinds) do
|
|
||||||
if command == "LuaRun" then M.lua_run = key end
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.api.nvim_create_user_command("LuaRun", M.run, {})
|
|
||||||
vim.keymap.set("n", M.lua_run, ":LuaRun<CR>", { silent = true })
|
|
||||||
end
|
|
||||||
|
|
||||||
function M.create_project()
|
function M.create_project()
|
||||||
vim.ui.input({ prompt = "Enter project name: " }, function(project_name)
|
vim.ui.input({ prompt = "Enter project name: " }, function(project_name)
|
||||||
if not project_name or project_name == "" then return print("Project creation canceled.") end
|
if not project_name or project_name == "" then return print("Project creation canceled.") end
|
||||||
local project_root = vim.fn.expand(M.config.project_root) .. "/" .. project_name
|
local project_root = vim.fn.expand(M.opts.project_root) .. "/" .. project_name
|
||||||
for _, path in ipairs({ "/lua/" .. project_name }) do vim.fn.mkdir(project_root .. path, "p") end
|
for _, path in ipairs({ "/lua/" .. project_name }) do vim.fn.mkdir(project_root .. path, "p") end
|
||||||
|
|
||||||
utils.write_file(project_root .. "/lua/" .. project_name .. "/init.lua", [[
|
utils.write_file(project_root .. "/lua/" .. project_name .. "/init.lua", [[
|
||||||
|
|||||||
+32
-10
@@ -1,6 +1,15 @@
|
|||||||
local M = {}
|
|
||||||
local term_cfg = require("Polydev.configs").defaults.terminal
|
|
||||||
local config = require("Polydev.configs")
|
local config = require("Polydev.configs")
|
||||||
|
local M = {}
|
||||||
|
|
||||||
|
M.opts = {}
|
||||||
|
|
||||||
|
function M.setup(opts)
|
||||||
|
-- Get the terminal options from the config (either user-config or defaults)
|
||||||
|
local terminal_opts = config.get("terminal")
|
||||||
|
|
||||||
|
-- If no user options are passed in, merge them with the defaults from config
|
||||||
|
M.opts = vim.tbl_deep_extend("force", {}, terminal_opts, opts or {})
|
||||||
|
end
|
||||||
|
|
||||||
function M.write_file(path, content)
|
function M.write_file(path, content)
|
||||||
local file = assert(io.open(path, "w"), "Error creating file: " .. path)
|
local file = assert(io.open(path, "w"), "Error creating file: " .. path)
|
||||||
@@ -11,12 +20,25 @@ function M.write_file(path, content)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function M.open_float_terminal(cmd)
|
function M.open_float_terminal(cmd)
|
||||||
|
if not M.opts.number then
|
||||||
|
print("Number is false")
|
||||||
|
end
|
||||||
|
|
||||||
|
if M.opts.number then
|
||||||
|
print("Number is true")
|
||||||
|
end
|
||||||
|
-- Ensure M.opts is correctly set before accessing
|
||||||
|
if not M.opts.left_padding then
|
||||||
|
print("Error: Terminal padding options are missing.")
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
local ui = vim.api.nvim_list_uis()[1]
|
local ui = vim.api.nvim_list_uis()[1]
|
||||||
|
|
||||||
local width = math.max(1, math.floor(ui.width * 0.9) - term_cfg.left_padding - term_cfg.right_padding)
|
local width = math.max(1, math.floor(ui.width * 0.9) - M.opts.left_padding or 0 - M.opts.right_padding or 0)
|
||||||
local height = math.max(1, math.floor(ui.height * 0.9) - term_cfg.top_padding - term_cfg.bottom_padding)
|
local height = math.max(1, math.floor(ui.height * 0.9) - M.opts.top_padding or 0 - M.opts.bottom_padding or 0)
|
||||||
local row = math.max(1, math.floor((ui.height - height) / 2) + term_cfg.top_padding)
|
local row = math.max(1, math.floor((ui.height - height) / 2) + (M.opts.top_padding or 0))
|
||||||
local col = math.max(1, math.floor((ui.width - width) / 2) + term_cfg.left_padding)
|
local col = math.max(1, math.floor((ui.width - width) / 2) + (M.opts.left_padding or 0))
|
||||||
|
|
||||||
local buf = vim.api.nvim_create_buf(false, true)
|
local buf = vim.api.nvim_create_buf(false, true)
|
||||||
local win = vim.api.nvim_open_win(buf, true, {
|
local win = vim.api.nvim_open_win(buf, true, {
|
||||||
@@ -26,19 +48,19 @@ function M.open_float_terminal(cmd)
|
|||||||
row = row,
|
row = row,
|
||||||
col = col,
|
col = col,
|
||||||
style = "minimal",
|
style = "minimal",
|
||||||
border = term_cfg.border and "rounded" or "none",
|
border = M.opts.border and "rounded" or "none",
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.api.nvim_win_set_option(win, "winblend", vim.o.pumblend)
|
vim.api.nvim_win_set_option(win, "winblend", vim.o.pumblend)
|
||||||
vim.api.nvim_win_set_option(win, "winhighlight", "Normal:Pmenu,FloatBorder:Pmenu")
|
vim.api.nvim_win_set_option(win, "winhighlight", "Normal:Pmenu,FloatBorder:Pmenu")
|
||||||
vim.api.nvim_win_set_option(win, "cursorline", true)
|
vim.api.nvim_win_set_option(win, "cursorline", true)
|
||||||
if(term_cfg.number == true) then
|
if(M.opts.number == true) then
|
||||||
vim.api.nvim_win_set_option(win, "number", true)
|
vim.api.nvim_win_set_option(win, "number", true)
|
||||||
if(term_cfg.relativenumber == true) then
|
if(M.opts.relativenumber == true) then
|
||||||
vim.api.nvim_win_set_option(win, "relativenumber", true)
|
vim.api.nvim_win_set_option(win, "relativenumber", true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if(term_cfg.scroll == true) then
|
if(M.opts.scroll == true) then
|
||||||
vim.api.nvim_win_set_option(win, "scrolloff", 5)
|
vim.api.nvim_win_set_option(win, "scrolloff", 5)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user