From d7b949d9f9121beefaa15ca5fe9fda5fc0d862bb Mon Sep 17 00:00:00 2001 From: DarthMooMancer <107283522+DarthMooMancer@users.noreply.github.com> Date: Thu, 30 Oct 2025 23:03:07 -0400 Subject: [PATCH] ui changes --- lua/Polydev/ui.lua | 267 ++++++++++++++++++--------------------------- 1 file changed, 109 insertions(+), 158 deletions(-) diff --git a/lua/Polydev/ui.lua b/lua/Polydev/ui.lua index 1aede87..c9725f8 100644 --- a/lua/Polydev/ui.lua +++ b/lua/Polydev/ui.lua @@ -27,94 +27,57 @@ end function M.manager(project_root) local templates = require("Polydev.templates") local ui = vim.api.nvim_list_uis()[1] - local width, height = math.floor(ui.width * 0.8), math.floor(ui.height * 0.9) - local row, col = math.floor((ui.height - height) / 2), math.floor((ui.width - width) / 2) + local width, height = math.floor(ui.width * 0.40), math.floor(ui.height * 0.4) + local row, col = math.floor((ui.height - height) / 3), math.floor((ui.width - width) / 2) local content_row = row + 2 local content_height = height - 3 - local tabs = { "Projects", "Recents" } - local selected = 1 - local selected_tab = tabs[selected] - local cwd = vim.fn.getcwd() local current_view = {} - local tab_buf = vim.api.nvim_create_buf(false, true) - local tab_win = vim.api.nvim_open_win(tab_buf, false, { + local content_buf = vim.api.nvim_create_buf(false, true) + local content_win = vim.api.nvim_open_win(content_buf, true, { relative = "editor", width = width, - height = 1, - row = row, + height = content_height, + row = content_row, col = col, style = "minimal", border = "rounded", }) - local content_bufs = { - Projects = vim.api.nvim_create_buf(false, true), - Recents = vim.api.nvim_create_buf(false, true), - } - - local content_wins = { - Projects = vim.api.nvim_open_win(content_bufs.Projects, true, { - relative = "editor", - width = width, - height = content_height, - row = content_row, - col = col, - style = "minimal", - border = "rounded", - }), - Recents = nil, - } - local function close_all_windows() - for _, win in pairs(content_wins) do - if win and vim.api.nvim_win_is_valid(win) then - pcall(vim.api.nvim_win_close, win, true) - end + if vim.api.nvim_win_is_valid(content_win) then + pcall(vim.api.nvim_win_close, content_win, true) end - pcall(vim.api.nvim_win_close, tab_win, true) - end - - - local function update_tab_bar() - local line = {} - for i, tab in ipairs(tabs) do - local label = (i == selected and "[ " .. tab .. " ]") or (" " .. tab .. " ") - table.insert(line, label) - end - vim.api.nvim_buf_set_lines(tab_buf, 0, -1, false, { table.concat(line, " ") }) end local function update_screen() - if selected_tab == "Projects" then - local entries = get_entries(cwd) - local root = vim.fn.expand(project_root) - if not cwd:find(root, 1, true) then - cwd = root - entries = get_entries(cwd) - end - if cwd ~= root then - table.insert(entries, 1, { - name = "../", - type = "directory", - full_path = vim.fn.fnamemodify(cwd, ":h"), - is_up = true, - }) - end - current_view = vim.deepcopy(entries) - - local lines = {} - for i, item in ipairs(current_view) do - table.insert(lines, string.format("%-2d | %-27s | %-6s", i, item.name, item.type)) - end - vim.api.nvim_buf_set_lines(content_bufs.Projects, 0, -1, false, lines) + local entries = get_entries(cwd) + local root = vim.fn.expand(project_root) + if not cwd:find(root, 1, true) then + cwd = root + entries = get_entries(cwd) end + if cwd ~= root then + table.insert(entries, 1, { + name = "../", + type = "directory", + full_path = vim.fn.fnamemodify(cwd, ":h"), + is_up = true, + }) + end + current_view = vim.deepcopy(entries) + + local lines = {} + for i, item in ipairs(current_view) do + table.insert(lines, string.format("%-2d | %-27s | %-6s", i, item.name, item.type)) + end + vim.api.nvim_buf_set_lines(content_buf, 0, -1, false, lines) end local function get_selected_entry() - local win = content_wins[selected_tab] + local win = content_win if not win or not vim.api.nvim_win_is_valid(win) then return end local row = vim.api.nvim_win_get_cursor(win)[1] return current_view[row], row @@ -135,110 +98,98 @@ function M.manager(project_root) return l, n end - update_tab_bar() update_screen() - -- Shared mappings - for _, buf in pairs(content_bufs) do - vim.keymap.set("n", "", function() - for _, win in pairs(content_wins) do - if win and vim.api.nvim_win_is_valid(win) then - pcall(vim.api.nvim_win_close, win, true) - end + local buf = content_buf + vim.keymap.set("n", "", function() + if vim.api.nvim_win_is_valid(content_win) then + pcall(vim.api.nvim_win_close, content_win, true) + end + end, { buffer = buf }) + vim.keymap.set("n", "a", function () + vim.ui.input({ prompt = "New folder name: " }, function(input) + if input then + vim.fn.mkdir(cwd .. "/" .. input, "p") + update_screen() end - pcall(vim.api.nvim_win_close, tab_win, true) - end, { buffer = buf }) - vim.keymap.set("n", "a", function () - vim.ui.input({ prompt = "New folder name: " }, function(input) + end) + end, { buffer = buf }) + vim.keymap.set("n", "R", function () + local entry = get_selected_entry() + if entry ~= nil and not entry.is_up then + vim.ui.input({ prompt = "Rename: ", default = entry.name }, function(input) if input then - vim.fn.mkdir(cwd .. "/" .. input, "p") + local new_path = cwd .. "/" .. input + vim.fn.rename(entry.full_path, new_path) update_screen() end end) - end, { buffer = buf }) - vim.keymap.set("n", "R", function () - local entry = get_selected_entry() - if entry ~= nil and not entry.is_up then - vim.ui.input({ prompt = "Rename: ", default = entry.name }, function(input) - if input then - local new_path = cwd .. "/" .. input - vim.fn.rename(entry.full_path, new_path) - update_screen() - end - end) - end - end, { buffer = buf }) - vim.keymap.set("n", "D", function() - local entry = get_selected_entry() - if entry ~= nil and not entry.is_up then - vim.ui.input({ prompt = "Deletion of " .. entry.name .. ": (y/N) Defaults to N: " }, function(input) - if input == "y" or input == "Y" then - vim.fn.delete(entry.full_path, "rf") - update_screen() - end - end) - end - end, { buffer = buf }) - vim.keymap.set("n", "%", function() - local lang, name = get_inputs("file") - if lang == nil or lang == "" then return print("Error: Lang cannot be nil") end - if templates.files[lang].run then - if name ~= nil and name ~= "" then - close_all_windows() - templates.files[lang].run(name) + end + end, { buffer = buf }) + vim.keymap.set("n", "D", function() + local entry = get_selected_entry() + if entry ~= nil and not entry.is_up then + vim.ui.input({ prompt = "Deletion of " .. entry.name .. ": (y/N) Defaults to N: " }, function(input) + if input == "y" or input == "Y" then + vim.fn.delete(entry.full_path, "rf") + update_screen() end - else - print("Error: No File creation method for " .. lang) + end) + end + end, { buffer = buf }) + vim.keymap.set("n", "%", function() + local lang, name = get_inputs("file") + if lang == nil or lang == "" then return print("Error: Lang cannot be nil") end + if templates.files[lang].run then + if name ~= nil and name ~= "" then + close_all_windows() + templates.files[lang].run(name) end - end, { buffer = buf }) - vim.keymap.set("n", "x", function() - local lang, name = get_inputs("aux file") - if lang == nil or lang == "" then return print("Error: Lang cannot be nil") end - if templates.extras.run then - if name ~= nil and name ~= "" then - close_all_windows() - templates.extras.run(lang, name) - end - else - print("Error: No File creation method for " .. lang) + else + print("Error: No File creation method for " .. lang) + end + end, { buffer = buf }) + vim.keymap.set("n", "x", function() + local lang, name = get_inputs("aux file") + if lang == nil or lang == "" then return print("Error: Lang cannot be nil") end + if templates.extras.run then + if name ~= nil and name ~= "" then + close_all_windows() + templates.extras.run(lang, name) end - end, { buffer = buf }) - vim.keymap.set("n", "d", function () - local lang, name = get_inputs("project") - local opts = {} - opts = vim.tbl_deep_extend("force", {}, require("Polydev.configs").get(lang), opts or {}) - if lang == nil or lang == "" then return print("Error: Lang cannot be nil") end - if templates.projects[lang].run then - if name ~= nil and name ~= "" then - close_all_windows() - templates.projects[lang].run(name, opts.project_root) - end - else - print("Error: No project creation method for " .. lang) + else + print("Error: No File creation method for " .. lang) + end + end, { buffer = buf }) + vim.keymap.set("n", "d", function () + local lang, name = get_inputs("project") + local opts = {} + opts = vim.tbl_deep_extend("force", {}, require("Polydev.configs").get(lang), opts or {}) + if lang == nil or lang == "" then return print("Error: Lang cannot be nil") end + if templates.projects[lang].run then + if name ~= nil and name ~= "" then + close_all_windows() + templates.projects[lang].run(name, opts.project_root) end - end, { buffer = buf }) - vim.keymap.set("n", "", function() - local entry = get_selected_entry() - if not entry then return end + else + print("Error: No project creation method for " .. lang) + end + end, { buffer = buf }) + vim.keymap.set("n", "", function() + local entry = get_selected_entry() + if not entry then return end - if entry.type == "file" then - for _, win in pairs(content_wins) do - if win and vim.api.nvim_win_is_valid(win) then - pcall(vim.api.nvim_win_close, win, true) - end - end - pcall(vim.api.nvim_win_close, tab_win, true) - vim.cmd("edit " .. vim.fn.fnameescape(entry.full_path)) - - elseif entry.type == "directory" then - cwd = entry.full_path - vim.cmd("cd " .. cwd) - update_screen() - else - print("Error") - end - end, { buffer = buf }) - end + if entry.type == "file" then + close_all_windows() + vim.cmd("edit " .. vim.fn.fnameescape(entry.full_path)) + elseif entry.type == "directory" then + cwd = entry.full_path + vim.cmd("cd " .. cwd) + update_screen() + else + print("Error") + end + end, { buffer = buf }) end return M