diff options
author | opalmay <[email protected]> | 2023-02-14 22:51:01 +0200 |
---|---|---|
committer | opalmay <[email protected]> | 2023-04-12 13:56:59 +0300 |
commit | 5eb2f1a37aed5fad4a467e186383e60d55411d4e (patch) | |
tree | 288b440f6e5e4909672c9910c5e3596f4393e8d3 /lua/lvim | |
parent | 81a9a92d104f0eb06fc785d04e98e68a24cbd328 (diff) |
refactor: keybinds -> terminals, keybind -> term_opts
Diffstat (limited to 'lua/lvim')
-rw-r--r-- | lua/lvim/config/_deprecated.lua | 4 | ||||
-rw-r--r-- | lua/lvim/core/terminal.lua | 52 |
2 files changed, 28 insertions, 28 deletions
diff --git a/lua/lvim/config/_deprecated.lua b/lua/lvim/config/_deprecated.lua index 6857c8ec..ceae7216 100644 --- a/lua/lvim/config/_deprecated.lua +++ b/lua/lvim/config/_deprecated.lua @@ -158,7 +158,7 @@ function M.post_load() if lvim.builtin.terminal.execs then deprecate( "lvim.builtin.terminal.execs", - "Use `lvim.builtin.terminal.commands` instead. See https://www.lunarvim.org/docs/configuration/keybindings#toggleterm-terminal-mappings" + "Use `lvim.builtin.terminal.terminals` instead. See https://www.lunarvim.org/docs/configuration/keybindings#toggleterm-terminal-mappings" ) for _, v in ipairs(lvim.builtin.terminal.execs) do local keybind = { @@ -168,7 +168,7 @@ function M.post_load() direction = v[4], size = v[5], } - lvim.builtin.terminal.keybinds[#lvim.builtin.terminal.keybinds + 1] = keybind + lvim.builtin.terminal.terminals[#lvim.builtin.terminal.terminals + 1] = keybind end end end diff --git a/lua/lvim/core/terminal.lua b/lua/lvim/core/terminal.lua index 5b3b89c0..2ef764fb 100644 --- a/lua/lvim/core/terminal.lua +++ b/lua/lvim/core/terminal.lua @@ -35,12 +35,12 @@ M.config = function() background = "Normal", }, }, - keybinds_defaults = { + terminals_defaults = { direction = "horizontal", horizontal_size = 0.3, vertical_size = 0.4, }, - keybinds = { + terminals = { { keymap = "<M-1>", direction = "horizontal" }, { keymap = "<M-2>", direction = "vertical" }, { keymap = "<M-3>", direction = "float" }, @@ -78,60 +78,60 @@ local function get_dynamic_terminal_size(direction, size) end end -local function keybind_toggle(keybind) +local function term_toggle(term_opts) local Terminal = require("toggleterm.terminal").Terminal - local term = Terminal:new(keybind) - term:toggle(keybind.size, keybind.direction) + local term = Terminal:new(term_opts) + term:toggle(term_opts.size, term_opts.direction) end -local function add_keybind_keymap(keybind) - local binary = keybind.cmd:match "(%S+)" +local function add_term_keymap(term_opts) + local binary = term_opts.cmd:match "(%S+)" if vim.fn.executable(binary) ~= 1 then Log:debug("Skipping configuring executable " .. binary .. ". Please make sure it is installed properly.") return end local modes = { "n" } - if not keybind.keymap:find "<leader>" then + if not term_opts.keymap:find "<leader>" then table.insert(modes, "t") end - vim.keymap.set(modes, keybind.keymap, function() - keybind_toggle(keybind) - end, { desc = keybind.desc, noremap = true, silent = true }) + vim.keymap.set(modes, term_opts.keymap, function() + term_toggle(term_opts) + end, { desc = term_opts.desc, noremap = true, silent = true }) end --- Setup the terminal cmds M.init = function() - for i, keybind in ipairs(lvim.builtin.terminal.keybinds) do + for i, term_opts in ipairs(lvim.builtin.terminal.terminals) do -- size == 1 is a special case for full screen - if keybind.size == 1 then - keybind.direction = "float" - keybind.float_opts = { + if term_opts.size == 1 then + term_opts.direction = "float" + term_opts.float_opts = { border = "none", width = 100000, height = 100000, } end - keybind.direction = keybind.direction or lvim.builtin.terminal.keybinds_defaults.direction - keybind.size = keybind.size or lvim.builtin.terminal.keybinds_defaults[keybind.direction .. "_size"] + term_opts.direction = term_opts.direction or lvim.builtin.terminal.terminals_defaults.direction + term_opts.size = term_opts.size or lvim.builtin.terminal.terminals_defaults[term_opts.direction .. "_size"] -- size is calculated dynamically as a percentage of the current buffer - keybind.size = get_dynamic_terminal_size(keybind.direction, keybind.size) - keybind.cmd = keybind.cmd or lvim.builtin.terminal.shell + term_opts.size = get_dynamic_terminal_size(term_opts.direction, term_opts.size) + term_opts.cmd = term_opts.cmd or lvim.builtin.terminal.shell -- desc is used for the keymap description - keybind.desc = keybind.desc - if keybind.desc == nil then - if keybind.cmd == nil then - keybind.desc = "Toggle Terminal(" .. keybind.direction .. ")" + term_opts.desc = term_opts.desc + if term_opts.desc == nil then + if term_opts.cmd == nil then + term_opts.desc = "Toggle Terminal(" .. term_opts.direction .. ")" else - keybind.desc = keybind.cmd + term_opts.desc = term_opts.cmd end end - keybind.count = i + 100 + term_opts.count = i + 100 -- the table is passed to toggleterm:new directly - add_keybind_keymap(keybind) + add_term_keymap(term_opts) end end |