Remove duplicate code, missed in d8dabe9 | Format files

navigator
Akianonymus 2 years ago committed by siduck
parent d8dabe9e5e
commit 6b06bb9ed4

@ -3,13 +3,6 @@ local g = vim.g
local options = require("core.utils").load_config().options local options = require("core.utils").load_config().options
--Defer loading shada until after startup
vim.opt.shadafile = "NONE"
vim.defer_fn(function()
vim.opt.shadafile = vim.fn.expand("$HOME") .. "/.local/share/nvim/shada/main.shada"
vim.cmd[[ rsh ]]
end, 0)
opt.title = true opt.title = true
opt.clipboard = options.clipboard opt.clipboard = options.clipboard
opt.cmdheight = options.cmdheight opt.cmdheight = options.cmdheight

@ -280,13 +280,14 @@ M.tbl_override_req = function(name, default_table)
return vim.tbl_deep_extend("force", default_table, override) return vim.tbl_deep_extend("force", default_table, override)
end end
M.remove_default_plugins = function(plugin_table) M.remove_default_plugins = function(plugin_table)
local removals = require("core.utils").load_config().plugins.default_plugin_remove or {} local removals = require("core.utils").load_config().plugins.default_plugin_remove or {}
if vim.tbl_isempty(removals) then return plugin_table end if vim.tbl_isempty(removals) then
newtable = {} return plugin_table
end
local newtable = {}
local i = 1 local i = 1
for index, value in ipairs(plugin_table) do for _, value in ipairs(plugin_table) do
local removed = false local removed = false
for _, removal in ipairs(removals) do for _, removal in ipairs(removals) do
if value[1] == removal then if value[1] == removal then
@ -295,7 +296,7 @@ M.remove_default_plugins = function(plugin_table)
end end
if not removed then if not removed then
newtable[i] = value newtable[i] = value
i = i+1 i = i + 1
end end
end end
return newtable return newtable

@ -14,8 +14,7 @@ local default = {
require("luasnip").lsp_expand(args.body) require("luasnip").lsp_expand(args.body)
end, end,
}) or { }) or {
expand = function(args) expand = function(args) end,
end,
}, },
formatting = { formatting = {
format = function(entry, vim_item) format = function(entry, vim_item)

Loading…
Cancel
Save