From d54395bfe347b38abf41150f09711011666a00b6 Mon Sep 17 00:00:00 2001 From: DarthMooMancer <107283522+DarthMooMancer@users.noreply.github.com> Date: Fri, 11 Apr 2025 10:55:06 -0400 Subject: [PATCH] Making creating new files universal instead of language specific so easier to make files --- lua/Polydev/c.lua | 5 --- lua/Polydev/cpp.lua | 4 -- lua/Polydev/html.lua | 96 ++++++++++++++++++++++++++++++++++++++++++ lua/Polydev/init.lua | 16 +++++++ lua/Polydev/java.lua | 5 --- lua/Polydev/lua.lua | 5 --- lua/Polydev/python.lua | 5 --- lua/Polydev/rust.lua | 5 --- 8 files changed, 112 insertions(+), 29 deletions(-) create mode 100644 lua/Polydev/html.lua diff --git a/lua/Polydev/c.lua b/lua/Polydev/c.lua index bc4a903..8614769 100644 --- a/lua/Polydev/c.lua +++ b/lua/Polydev/c.lua @@ -2,7 +2,6 @@ local M = {} M.close_key = nil M.c_build = nil M.c_run = nil -M.new_c_file = nil M.new_c_header_file = nil M.config = { @@ -11,7 +10,6 @@ M.config = { [""] = "CloseTerminal", ["pb"] = "CBuild", ["pr"] = "CRun", - ["nf"] = "NewCFile", ["nh"] = "NewCHeaderFile", }, terminal = { @@ -33,18 +31,15 @@ function M.setup(opts) if command == "CloseTerminal" then M.close_key = key end if command == "CBuild" then M.c_build = key end if command == "CRun" then M.c_run = key end - if command == "NewCFile" then M.new_c_file = key end if command == "NewCHeaderFile" then M.new_c_header_file = key end end vim.api.nvim_create_user_command("NewCHeaderFile", M.create_new_header_file, {}) - vim.api.nvim_create_user_command("NewCFile", M.create_new_file, {}) vim.api.nvim_create_user_command("CBuild", M.build, {}) vim.api.nvim_create_user_command("CRun", M.run, {}) vim.keymap.set("n", M.c_build, ":CBuild", { silent = true }) vim.keymap.set("n", M.c_run, ":CRun", { silent = true }) - vim.keymap.set("n", M.new_c_file, ":NewCFile", { silent = true }) vim.keymap.set("n", M.new_c_header_file, ":NewCHeaderFile", { silent = true }) end diff --git a/lua/Polydev/cpp.lua b/lua/Polydev/cpp.lua index d3954ea..ba61240 100644 --- a/lua/Polydev/cpp.lua +++ b/lua/Polydev/cpp.lua @@ -11,7 +11,6 @@ M.config = { [""] = "CloseTerminal", ["pb"] = "CBuild", ["pr"] = "CRun", - ["nf"] = "NewCFile", ["nh"] = "NewCHeaderFile", }, terminal = { @@ -33,18 +32,15 @@ function M.setup(opts) if command == "CloseTerminal" then M.close_key = key end if command == "CBuild" then M.c_build = key end if command == "CRun" then M.c_run = key end - if command == "NewCFile" then M.new_c_file = key end if command == "NewCHeaderFile" then M.new_c_header_file = key end end vim.api.nvim_create_user_command("NewCHeaderFile", M.create_new_header_file, {}) - vim.api.nvim_create_user_command("NewCFile", M.create_new_file, {}) vim.api.nvim_create_user_command("CBuild", M.build, {}) vim.api.nvim_create_user_command("CRun", M.run, {}) vim.keymap.set("n", M.c_build, ":CBuild", { silent = true }) vim.keymap.set("n", M.c_run, ":CRun", { silent = true }) - vim.keymap.set("n", M.new_c_file, ":NewCFile", { silent = true }) vim.keymap.set("n", M.new_c_header_file, ":NewCHeaderFile", { silent = true }) end diff --git a/lua/Polydev/html.lua b/lua/Polydev/html.lua new file mode 100644 index 0000000..315dc2e --- /dev/null +++ b/lua/Polydev/html.lua @@ -0,0 +1,96 @@ +local M = {} +M.java_build = nil +M.java_run = nil + +M.config = { + project_root = "~/Projects/Java", + keybinds = { + [""] = "CloseTerminal", + ["pb"] = "JavaBuild", + ["pr"] = "JavaRun", + }, +} + +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 == "JavaBuild" then M.java_build = key end + if command == "JavaRun" then M.java_run = key end + end + + vim.keymap.set("n", M.java_build, ":JavaBuild", { silent = true }) + vim.keymap.set("n", M.java_run, ":JavaRun", { silent = true }) + + vim.api.nvim_create_user_command("JavaBuild", M.build, {}) + vim.api.nvim_create_user_command("JavaRun", M.run, {}) +end + +local function write_file(path, content) + local file = assert(io.open(path, "w"), "Error creating file: " .. path) + file:write(content) + file:close() + vim.cmd("edit " .. path) + print(path .. " created successfully!") +end + +function M.create_project() + vim.ui.input({ prompt = "Enter project name: " }, function(project_name) + 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 + for _, path in ipairs({ "/src", "/build" }) do vim.fn.mkdir(project_root .. path, "p") end + + local main_java_content = [[ +public class Main { + public static void main(String[] args) { + System.out.println("Hello, World!"); + } +} +]] + + write_file(project_root .. "/src/Main.java", main_java_content) + end) +end + +function M.create_new_file() + vim.ui.input({ prompt = "Enter class name: " }, function(class_name) + if not class_name or class_name == "" then return print("Class creation canceled.") end + local root_dir = vim.fn.expand("%:p:h"):match("(.*)/src") + if not root_dir then return print("Error: src directory not found.") end + local java_content = string.format([[ +public class %s { + // New File +} +]], class_name) + + write_file(root_dir .. "/src/" .. class_name .. ".java", java_content) + end) +end + +function M.build() + local project_root = vim.fn.expand("%:p:h"):match("(.*)/src") + if not project_root then return print("Error: Could not detect project root directory.") end + local out_dir = project_root .. "/build" + + vim.fn.mkdir(out_dir, "p") + local compile_command = string.format("javac -d %s %s/*.java", out_dir, project_root .. "/src") + local compile_status = vim.fn.system(compile_command) + + if vim.v.shell_error == 0 then + print("Compilation successful!") + else + print("Error during compilation. Opening terminal for details...") + local term_buf = M.open_float_terminal(compile_command) + vim.api.nvim_buf_set_option(term_buf, "modifiable", true) + vim.api.nvim_buf_set_lines(term_buf, 0, -1, false, vim.split(compile_status, "\n", { trimempty = true })) + vim.api.nvim_buf_set_option(term_buf, "modifiable", false) + end +end + +function M.run() + local project_root = vim.fn.expand("%:p:h"):match("(.*)/src") + if not project_root then return print("Error: Must be inside the 'src' directory.") end + M.open_float_terminal("java -cp " .. project_root .. "/build" .. " Main") +end + +return M diff --git a/lua/Polydev/init.lua b/lua/Polydev/init.lua index 7fc3114..88a6c86 100644 --- a/lua/Polydev/init.lua +++ b/lua/Polydev/init.lua @@ -3,9 +3,11 @@ local M = {} M.loaded_languages = {} M.java = require("Polydev.java") M.c = require("Polydev.c") +M.cpp = require("Polydev.cpp") M.lua = require("Polydev.lua") M.python = require("Polydev.python") M.rust = require("Polydev.rust") +M.html = require("Polydev.html") function M.load_language_module(lang) if M.loaded_languages[lang] then return true end @@ -31,9 +33,23 @@ function M.create_project() end) end +function M.create_new_file() + vim.ui.input({ prompt = "Enter language for new file: " }, function(lang) + if not lang or lang == "" then return print("File creation canceled.") end + + if M.load_language_module(lang) and M.loaded_languages[lang].create_new_file then + M.loaded_languages[lang].create_new_file() + else + print("Error: No File creation method for " .. lang) + end + end) +end + function M.setup() vim.api.nvim_create_user_command("NewProject", M.create_project, {}) + vim.api.nvim_create_user_command("NewFile", M.create_new_file, {}) vim.keymap.set("n", "np", ":NewProject", { silent = true }) + vim.keymap.set("n", "nf", ":NewFile", { silent = true }) vim.api.nvim_create_autocmd("FileType", { pattern = "*", callback = function() diff --git a/lua/Polydev/java.lua b/lua/Polydev/java.lua index 2e492f2..71734be 100644 --- a/lua/Polydev/java.lua +++ b/lua/Polydev/java.lua @@ -2,7 +2,6 @@ local M = {} M.close_key = nil M.java_build = nil M.java_run = nil -M.new_java_file = nil M.config = { project_root = "~/Projects/Java", @@ -10,7 +9,6 @@ M.config = { [""] = "CloseTerminal", ["pb"] = "JavaBuild", ["pr"] = "JavaRun", - ["nf"] = "NewJavaFile", }, terminal = { right_padding = 0, @@ -31,14 +29,11 @@ function M.setup(opts) if command == "CloseTerminal" then M.close_key = key end if command == "JavaBuild" then M.java_build = key end if command == "JavaRun" then M.java_run = key end - if command == "NewJavaFile" then M.new_java_file = key end end vim.keymap.set("n", M.java_build, ":JavaBuild", { silent = true }) vim.keymap.set("n", M.java_run, ":JavaRun", { silent = true }) - vim.keymap.set("n", M.new_java_file, ":NewJavaFile", { silent = true }) - vim.api.nvim_create_user_command("NewJavaFile", M.create_new_file, {}) vim.api.nvim_create_user_command("JavaBuild", M.build, {}) vim.api.nvim_create_user_command("JavaRun", M.run, {}) end diff --git a/lua/Polydev/lua.lua b/lua/Polydev/lua.lua index e3003cd..00794bc 100644 --- a/lua/Polydev/lua.lua +++ b/lua/Polydev/lua.lua @@ -1,14 +1,12 @@ local M = {} M.close_key = nil M.lua_run = nil -M.new_lua_file = nil M.config = { project_root = "~/Projects/Lua", keybinds = { [""] = "CloseTerminal", ["pr"] = "LuaRun", - ["nf"] = "NewLuaFile", }, terminal = { right_padding = 0, @@ -44,13 +42,10 @@ function M.setup(opts) for key, command in pairs(M.config.keybinds) do if command == "CloseTerminal" then M.close_key = key end if command == "LuaRun" then M.lua_run = key end - if command == "NewLuaFile" then M.new_lua_file = key end end - vim.api.nvim_create_user_command("NewLuaFile", M.create_new_file, {}) vim.api.nvim_create_user_command("LuaRun", M.run, {}) vim.keymap.set("n", M.lua_run, ":LuaRun", { silent = true }) - vim.keymap.set("n", M.new_lua_file, ":NewLuaFile", { silent = true }) end function M.open_float_terminal(cmd) diff --git a/lua/Polydev/python.lua b/lua/Polydev/python.lua index e515d1a..b068f70 100644 --- a/lua/Polydev/python.lua +++ b/lua/Polydev/python.lua @@ -1,7 +1,6 @@ local M = {} M.close_key = nil M.c_run = nil -M.new_python_file = nil M.new_pip_module = nil M.run_custom = nil @@ -10,7 +9,6 @@ M.config = { keybinds = { [""] = "CloseTerminal", ["pr"] = "PythonRun", - ["nf"] = "NewPythonFile", ["pb"] = "PythonPip", ["pc"] = "PythonCustom" }, @@ -31,7 +29,6 @@ function M.setup(opts) for key, command in pairs(M.config.keybinds) do if command == "CloseTerminal" then M.close_key = key end if command == "PythonRun" then M.c_run = key end - if command == "NewPythonFile" then M.new_python_file = key end if command == "PythonPip" then M.new_pip_module = key end if command == "PythonCustom" then M.run_custom = key end end @@ -46,13 +43,11 @@ function M.setup(opts) end vim.api.nvim_create_user_command("PythonPip", M.install_dependency, {}) - vim.api.nvim_create_user_command("NewPythonFile", M.create_new_file, {}) vim.api.nvim_create_user_command("PythonRun", M.run, {}) vim.api.nvim_create_user_command("PythonCustom", M.custom_run, {}) vim.keymap.set("n", M.c_run, ":PythonRun", { silent = true }) - vim.keymap.set("n", M.new_python_file, ":NewPythonFile", { silent = true }) vim.keymap.set("n", M.new_pip_module, ":PythonPip", { silent = true }) vim.keymap.set("n", M.run_custom, ":PythonCustom", { silent = true }) end diff --git a/lua/Polydev/rust.lua b/lua/Polydev/rust.lua index 80607b2..edfbe85 100644 --- a/lua/Polydev/rust.lua +++ b/lua/Polydev/rust.lua @@ -2,7 +2,6 @@ local M = {} M.close_key = nil M.rust_build = nil M.rust_run = nil -M.new_rust_file = nil M.config = { project_root = "~/Projects/Rust", @@ -10,7 +9,6 @@ M.config = { [""] = "CloseTerminal", ["pb"] = "RustBuild", ["pr"] = "RustRun", - ["nf"] = "NewRustFile", }, terminal = { right_padding = 0, @@ -30,16 +28,13 @@ function M.setup(opts) if command == "CloseTerminal" then M.close_key = key end if command == "RustBuild" then M.rust_build = key end if command == "RustRun" then M.rust_run = key end - if command == "NewRustFile" then M.new_rust_file = key end end - vim.api.nvim_create_user_command("NewRustFile", M.create_new_file, {}) vim.api.nvim_create_user_command("RustBuild", M.build, {}) vim.api.nvim_create_user_command("RustRun", M.run, {}) vim.keymap.set("n", M.rust_build, ":RustBuild", { silent = true }) vim.keymap.set("n", M.rust_run, ":RustRun", { silent = true }) - vim.keymap.set("n", M.new_rust_file, ":NewRustFile", { silent = true }) end function M.open_float_terminal(cmd)