rework: open_float_terminal uses table instead of string
fix: all languages now use proper terminal setup
This commit is contained in:
@@ -1,30 +1,21 @@
|
||||
local utils = require("Polydev.utils")
|
||||
local M = {}
|
||||
|
||||
M.keybinds = {}
|
||||
M.opts = {}
|
||||
|
||||
function M.setup(opts)
|
||||
M.opts = vim.tbl_deep_extend("force", {}, require("Polydev.configs").get("cpp"), opts or {})
|
||||
function M.setup(user_opts)
|
||||
local opts = vim.tbl_deep_extend("force", {}, require("Polydev.configs").get("cpp"), user_opts or {})
|
||||
vim.api.nvim_create_user_command("CppRun", M.run, {})
|
||||
for key, command in pairs(M.opts.keybinds) do
|
||||
M.keybinds[command] = key
|
||||
end
|
||||
|
||||
if M.keybinds.CppRun then
|
||||
vim.keymap.set("n", M.keybinds.CppRun, ":CppRun<CR>", { silent = true })
|
||||
for key, _ in pairs(opts.keybinds) do
|
||||
vim.keymap.set("n", key, ":CppRun<CR>", { silent = true })
|
||||
end
|
||||
end
|
||||
|
||||
function M.run()
|
||||
local root = utils.get_project_root()
|
||||
local build_dir = root .. "/build"
|
||||
|
||||
local cmd = "cd " .. build_dir .. " && cmake --build ."
|
||||
local output = vim.fn.system(cmd)
|
||||
local success = vim.v.shell_error == 0
|
||||
local cmd = { "cd " .. root, "build", " && cmake --build ." }
|
||||
local output = vim.fn.system(table.concat(cmd, "/"))
|
||||
|
||||
if not success then
|
||||
if not vim.v.shell_error == 0 then
|
||||
local term_buf = utils.open_float_terminal(cmd)
|
||||
vim.api.nvim_buf_set_option(term_buf, "modifiable", true)
|
||||
vim.api.nvim_buf_set_lines(term_buf, 0, -1, false,
|
||||
@@ -32,7 +23,7 @@ function M.run()
|
||||
)
|
||||
vim.api.nvim_buf_set_option(term_buf, "modifiable", false)
|
||||
else
|
||||
utils.open_float_terminal("cd " .. build_dir .. " && ./" .. utils.get_project_name())
|
||||
utils.open_float_terminal({ "cd " .. root, "build" .. " && .", utils.get_project_name() })
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user