feat: make autopairs configurable

This commit is contained in:
kylo252 2021-08-11 17:29:20 +02:00
parent 5a7630cac7
commit 1b5730d511
3 changed files with 60 additions and 48 deletions

View file

@ -1,54 +1,65 @@
-- if not package.loaded['nvim-autopairs'] then local M = {}
-- return
-- end
local Log = require "core.log"
local status_ok, _ = pcall(require, "nvim-autopairs")
if not status_ok then
Log:get_default().error "Failed to load autopairs"
return
end
local npairs = require "nvim-autopairs"
local Rule = require "nvim-autopairs.rule"
-- skip it, if you use another global object function M.config()
_G.MUtils = {} lvim.builtin.autopairs = {
active = true,
vim.g.completion_confirm_key = "" ---@usage map <CR> on insert mode
MUtils.completion_confirm = function() map_cr = true,
if vim.fn.pumvisible() ~= 0 then ---@usage it will auto insert after select function or method item,
if vim.fn.complete_info()["selected"] ~= -1 then map_complete = map_complete_optional,
return vim.fn["compe#confirm"](npairs.esc "<cr>") ---@usage check treesitter
else check_ts = true,
return npairs.esc "<cr>" ts_config = {
end lua = { "string" },
else javascript = { "template_string" },
return npairs.autopairs_cr() java = false,
end },
end
if package.loaded["compe"] then
local map_complete_optional = vim.bo.filetype ~= "tex"
require("nvim-autopairs.completion.compe").setup {
map_cr = true, -- map <CR> on insert mode
map_complete = map_complete_optional, -- it will auto insert `(` after select function or method item
} }
end end
npairs.setup { M.setup = function()
check_ts = true, -- skip it, if you use another global object
ts_config = { _G.MUtils = {}
lua = { "string" }, -- it will not add pair on that treesitter node local Log = require "core.log"
javascript = { "template_string" }, local npairs = require "nvim-autopairs"
java = false, -- don't check treesitter on java local Rule = require "nvim-autopairs.rule"
},
}
require("nvim-treesitter.configs").setup { autopairs = { enable = true } } vim.g.completion_confirm_key = ""
MUtils.completion_confirm = function()
if vim.fn.pumvisible() ~= 0 then
if vim.fn.complete_info()["selected"] ~= -1 then
return vim.fn["compe#confirm"](npairs.esc "<cr>")
else
return npairs.esc "<cr>"
end
else
return npairs.autopairs_cr()
end
end
local ts_conds = require "nvim-autopairs.ts-conds" if package.loaded["compe"] then
local map_complete_optional = vim.bo.filetype ~= "tex"
require("nvim-autopairs.completion.compe").setup {
map_cr = lvim.builtin.autopairs.map_cr,
map_complete = lvim.builtin.autopairs.map_complete,
}
end
-- press % => %% is only inside comment or string npairs.setup {
npairs.add_rules { check_ts = lvim.builtin.autopairs.check_ts,
Rule("%", "%", "lua"):with_pair(ts_conds.is_ts_node { "string", "comment" }), ts_config = lvim.builtin.autopairs.ts_config,
Rule("$", "$", "lua"):with_pair(ts_conds.is_not_ts_node { "function" }), }
}
require("nvim-treesitter.configs").setup { autopairs = { enable = true } }
local ts_conds = require "nvim-autopairs.ts-conds"
-- TODO: can these rules be safely added from "config.lua" ?
-- press % => %% is only inside comment or string
npairs.add_rules {
Rule("%", "%", "lua"):with_pair(ts_conds.is_ts_node { "string", "comment" }),
Rule("$", "$", "lua"):with_pair(ts_conds.is_not_ts_node { "function" }),
}
end
return M

View file

@ -1293,3 +1293,4 @@ require("core.treesitter").config()
require("core.nvimtree").config() require("core.nvimtree").config()
require("core.rooter").config() require("core.rooter").config()
require("core.bufferline").config() require("core.bufferline").config()
require("core.autopairs").config()

View file

@ -68,7 +68,7 @@ return {
-- event = "InsertEnter", -- event = "InsertEnter",
after = "nvim-compe", after = "nvim-compe",
config = function() config = function()
require "core.autopairs" require("core.autopairs").setup()
if lvim.builtin.autopairs.on_config_done then if lvim.builtin.autopairs.on_config_done then
lvim.builtin.autopairs.on_config_done(require "nvim-autopairs") lvim.builtin.autopairs.on_config_done(require "nvim-autopairs")
end end