mirror of
https://github.com/LunarVim/LunarVim.git
synced 2024-09-20 10:35:08 +02:00
[Refactor] Clean-up redundant module-load checks (#1011)
This commit is contained in:
parent
f36fd1907f
commit
6eb75c5678
8 changed files with 15 additions and 57 deletions
|
@ -4,8 +4,7 @@ repos:
|
|||
- id: shfmt
|
||||
name: shfmt
|
||||
minimum_pre_commit_version: 2.4.0
|
||||
language: golang
|
||||
additional_dependencies: [mvdan.cc/sh/v3/cmd/shfmt@v3.2.2]
|
||||
language: system
|
||||
entry: shfmt
|
||||
args: [-i=2, -ci, -w]
|
||||
types: [shell]
|
||||
|
@ -21,7 +20,7 @@ repos:
|
|||
language: rust
|
||||
entry: stylua
|
||||
types: [lua]
|
||||
args: [.]
|
||||
args: ['-']
|
||||
- id: luacheck
|
||||
name: luacheck
|
||||
language: system
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
local M = {}
|
||||
local Log = require "core.log"
|
||||
M.config = function()
|
||||
lvim.builtin.compe = {
|
||||
enabled = true,
|
||||
|
@ -61,11 +60,7 @@ end
|
|||
M.setup = function()
|
||||
vim.g.vsnip_snippet_dir = lvim.vsnip_dir
|
||||
|
||||
local status_ok, compe = pcall(require, "compe")
|
||||
if not status_ok then
|
||||
Log:get_default().error "Failed to load compe"
|
||||
return
|
||||
end
|
||||
local compe = require "compe"
|
||||
|
||||
compe.setup(lvim.builtin.compe)
|
||||
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
local M = {}
|
||||
local Log = require "core.log"
|
||||
M.config = function()
|
||||
lvim.builtin.dap = {
|
||||
active = false,
|
||||
|
@ -13,11 +12,7 @@ M.config = function()
|
|||
end
|
||||
|
||||
M.setup = function()
|
||||
local status_ok, dap = pcall(require, "dap")
|
||||
if not status_ok then
|
||||
Log:get_default().error "Failed to load dap"
|
||||
return
|
||||
end
|
||||
local dap = require "dap"
|
||||
|
||||
vim.fn.sign_define("DapBreakpoint", lvim.builtin.dap.breakpoint)
|
||||
dap.defaults.fallback.terminal_win_cmd = "50vsplit new"
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
local M = {}
|
||||
local Log = require "core.log"
|
||||
M.config = function()
|
||||
lvim.builtin.gitsigns = {
|
||||
signs = {
|
||||
|
@ -49,12 +48,7 @@ M.config = function()
|
|||
end
|
||||
|
||||
M.setup = function()
|
||||
local status_ok, gitsigns = pcall(require, "gitsigns")
|
||||
if not status_ok then
|
||||
Log:get_default().error "Failed to load gitsigns"
|
||||
return
|
||||
end
|
||||
gitsigns.setup(lvim.builtin.gitsigns)
|
||||
require("gitsigns").setup(lvim.builtin.gitsigns)
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
local M = {}
|
||||
local Log = require "core.log"
|
||||
function M.config()
|
||||
local status_ok, actions = pcall(require, "telescope.actions")
|
||||
if not status_ok then
|
||||
|
@ -114,6 +113,7 @@ end
|
|||
function M.setup()
|
||||
local status_ok, telescope = pcall(require, "telescope")
|
||||
if not status_ok then
|
||||
local Log = require "core.log"
|
||||
Log:get_default().error "Failed to load telescope"
|
||||
return
|
||||
end
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
local M = {}
|
||||
local Log = require "core.log"
|
||||
local utils = require "utils"
|
||||
|
||||
M.config = function()
|
||||
|
@ -46,22 +45,13 @@ M.config = function()
|
|||
end
|
||||
|
||||
M.setup = function()
|
||||
local status_ok, terminal = pcall(require, "toggleterm")
|
||||
if not status_ok then
|
||||
Log:get_default().error "Failed to load toggleterm"
|
||||
print(terminal)
|
||||
return
|
||||
end
|
||||
local terminal = require "toggleterm"
|
||||
for _, exec in pairs(lvim.builtin.terminal.execs) do
|
||||
require("core.terminal").add_exec(exec[1], exec[2], exec[3])
|
||||
end
|
||||
terminal.setup(lvim.builtin.terminal)
|
||||
end
|
||||
|
||||
local function is_installed(exe)
|
||||
return vim.fn.executable(exe) == 1
|
||||
end
|
||||
|
||||
M.add_exec = function(exec, keymap, name)
|
||||
vim.api.nvim_set_keymap(
|
||||
"n",
|
||||
|
@ -85,8 +75,9 @@ end
|
|||
|
||||
M._exec_toggle = function(exec)
|
||||
local binary = M._split(exec)[1]
|
||||
if is_installed(binary) ~= true then
|
||||
print("Please install executable " .. binary .. ". Check documentation for more information")
|
||||
if vim.fn.executable(binary) ~= 1 then
|
||||
local Log = require "core.log"
|
||||
Log:get_default().error("Unable to run executable " .. binary .. ". Please make sure it is installed properly.")
|
||||
return
|
||||
end
|
||||
local Terminal = require("toggleterm.terminal").Terminal
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
local M = {}
|
||||
local Log = require "core.log"
|
||||
M.config = function()
|
||||
lvim.builtin.which_key = {
|
||||
active = false,
|
||||
|
@ -230,14 +229,7 @@ M.config = function()
|
|||
end
|
||||
|
||||
M.setup = function()
|
||||
-- if not package.loaded['which-key'] then
|
||||
-- return
|
||||
-- end
|
||||
local status_ok, which_key = pcall(require, "which-key")
|
||||
if not status_ok then
|
||||
Log:get_default "Failed to load whichkey"
|
||||
return
|
||||
end
|
||||
local which_key = require "which-key"
|
||||
|
||||
which_key.setup(lvim.builtin.which_key.setup)
|
||||
|
||||
|
@ -247,10 +239,8 @@ M.setup = function()
|
|||
local mappings = lvim.builtin.which_key.mappings
|
||||
local vmappings = lvim.builtin.which_key.vmappings
|
||||
|
||||
local wk = require "which-key"
|
||||
|
||||
wk.register(mappings, opts)
|
||||
wk.register(vmappings, vopts)
|
||||
which_key.register(mappings, opts)
|
||||
which_key.register(vmappings, vopts)
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
@ -131,15 +131,9 @@ return {
|
|||
"terrortylor/nvim-comment",
|
||||
event = "BufRead",
|
||||
config = function()
|
||||
local status_ok, nvim_comment = pcall(require, "nvim_comment")
|
||||
if not status_ok then
|
||||
local Log = require "core.log"
|
||||
Log:get_default().error "Failed to load nvim-comment"
|
||||
return
|
||||
end
|
||||
nvim_comment.setup()
|
||||
require("nvim_comment").setup()
|
||||
if lvim.builtin.comment.on_config_done then
|
||||
lvim.builtin.comment.on_config_done(nvim_comment)
|
||||
lvim.builtin.comment.on_config_done(require "nvim_comment")
|
||||
end
|
||||
end,
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue