more lazyload

This commit is contained in:
christianchiarulli 2021-07-04 12:32:11 -04:00
parent c0a48c186b
commit be87f71c20
2 changed files with 22 additions and 25 deletions

View file

@ -1,51 +1,47 @@
-- if not package.loaded['nvim-autopairs'] then -- if not package.loaded['nvim-autopairs'] then
-- return -- return
-- end -- end
local npairs = require('nvim-autopairs') local npairs = require('nvim-autopairs')
local Rule = require('nvim-autopairs.rule') local Rule = require('nvim-autopairs.rule')
-- skip it, if you use another global object -- skip it, if you use another global object
_G.MUtils= {} _G.MUtils = {}
vim.g.completion_confirm_key = "" vim.g.completion_confirm_key = ""
MUtils.completion_confirm=function() MUtils.completion_confirm = function()
if vim.fn.pumvisible() ~= 0 then if vim.fn.pumvisible() ~= 0 then
if vim.fn.complete_info()["selected"] ~= -1 then if vim.fn.complete_info()["selected"] ~= -1 then
return vim.fn["compe#confirm"](npairs.esc("<cr>")) return vim.fn["compe#confirm"](npairs.esc("<cr>"))
else
return npairs.esc("<cr>")
end
else else
return npairs.esc("<cr>") return npairs.autopairs_cr()
end end
else
return npairs.autopairs_cr()
end
end end
if package.loaded['compe'] then
require("nvim-autopairs.completion.compe").setup({ require("nvim-autopairs.completion.compe").setup({
map_cr = true, -- map <CR> on insert mode map_cr = true, -- map <CR> on insert mode
map_complete = true -- it will auto insert `(` after select function or method item map_complete = true -- it will auto insert `(` after select function or method item
}) })
end
npairs.setup({ npairs.setup({
check_ts = true, check_ts = true,
ts_config = { ts_config = {
lua = {'string'},-- it will not add pair on that treesitter node lua = {'string'}, -- it will not add pair on that treesitter node
javascript = {'template_string'}, javascript = {'template_string'},
java = false,-- don't check treesitter on java java = false -- don't check treesitter on java
} }
}) })
require('nvim-treesitter.configs').setup { require('nvim-treesitter.configs').setup {autopairs = {enable = true}}
autopairs = {enable = true}
}
local ts_conds = require('nvim-autopairs.ts-conds') local ts_conds = require('nvim-autopairs.ts-conds')
-- press % => %% is only inside comment or string -- press % => %% is only inside comment or string
npairs.add_rules({ npairs.add_rules({
Rule("%", "%", "lua") Rule("%", "%", "lua"):with_pair(ts_conds.is_ts_node({'string', 'comment'})),
:with_pair(ts_conds.is_ts_node({'string','comment'})), Rule("$", "$", "lua"):with_pair(ts_conds.is_not_ts_node({'function'}))
Rule("$", "$", "lua")
:with_pair(ts_conds.is_not_ts_node({'function'}))
}) })

View file

@ -90,8 +90,9 @@ return require("packer").startup(function(use)
-- Autopairs -- Autopairs
use { use {
-- event = "InsertEnter",
"windwp/nvim-autopairs", "windwp/nvim-autopairs",
event = "InsertEnter",
after = {"telescope.nvim", "nvim-compe"},
config = function() config = function()
require 'lv-autopairs' require 'lv-autopairs'
end end