From 15913c75b76cd7516df94fdda9c0505bfab4ed25 Mon Sep 17 00:00:00 2001 From: DarthMooMancer <107283522+DarthMooMancer@users.noreply.github.com> Date: Wed, 7 May 2025 11:31:49 -0400 Subject: [PATCH] FIX: fixed lua to not use global function but local to stop nil error --- lua/Polydev/languages/cpp.lua | 5 +++-- lua/Polydev/languages/lua.lua | 2 +- lua/Polydev/utils.lua | 10 ---------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/lua/Polydev/languages/cpp.lua b/lua/Polydev/languages/cpp.lua index 5ffa614..bb1b003 100644 --- a/lua/Polydev/languages/cpp.lua +++ b/lua/Polydev/languages/cpp.lua @@ -6,12 +6,13 @@ M.opts = nil function M.setup(opts) M.opts = vim.tbl_deep_extend("force", {}, require("Polydev.configs").get("cpp"), opts or {}) + vim.api.nvim_create_user_command("NewCppHeaderFile", M.create_new_header_file, {}) + vim.api.nvim_create_user_command("CppRun", M.run, {}) + for key, command in pairs(M.opts.keybinds) do M.keybinds[command] = key end - vim.api.nvim_create_user_command("NewCppHeaderFile", M.create_new_header_file, {}) - vim.api.nvim_create_user_command("CppRun", M.run, {}) if M.keybinds.CppRun then vim.keymap.set("n", M.keybinds.CppRun, ":CppRun", { silent = true }) diff --git a/lua/Polydev/languages/lua.lua b/lua/Polydev/languages/lua.lua index 971beeb..c86adc9 100644 --- a/lua/Polydev/languages/lua.lua +++ b/lua/Polydev/languages/lua.lua @@ -38,7 +38,7 @@ function M.run() ---@return string local function get_project_name() - return vim.fn.glob((M.get_project_root() or "") .. "/*.polydev"):match("([^/]+)%.polydev$") + return vim.fn.glob((get_project_root() or "") .. "/*.polydev"):match("([^/]+)%.polydev$") end ---@return string diff --git a/lua/Polydev/utils.lua b/lua/Polydev/utils.lua index 7bd917c..b546c55 100644 --- a/lua/Polydev/utils.lua +++ b/lua/Polydev/utils.lua @@ -1,26 +1,18 @@ ----@module "Polydev.presets" local presets = require("Polydev.presets") ----@type table local M = {} ----@type table M.opts = {} ----@param opts table function M.setup(opts) M.opts = vim.tbl_deep_extend("force", {}, require("Polydev.configs").get("terminal"), opts or {}) end ----@param path string ----@return boolean function M.is_dir(path) local stat = vim.loop.fs_stat(path) return stat and stat.type == "directory" end ----@param path string ----@param content string function M.write_file(path, content) local file = assert(io.open(path, "w"), "Error creating file: " .. path) file:write(content) @@ -28,8 +20,6 @@ function M.write_file(path, content) vim.cmd("edit " .. path) end ----@param cmd string ----@return boolean?, table?, nil? function M.open_float_terminal(cmd) local presets_opts = {} if presets.getPresets(M.opts.presets) == nil then return nil end