mirror of
https://github.com/LunarVim/LunarVim.git
synced 2024-09-20 18:45:08 +02:00
Revert "Merge pull request #1294 from kylo252/autopairs-refactor"
This reverts commitd71c3280c8
, reversing changes made toa334420381
.
This commit is contained in:
parent
d71c3280c8
commit
4fd72b1be2
3 changed files with 45 additions and 56 deletions
|
@ -1,63 +1,54 @@
|
||||||
local M = {}
|
-- if not package.loaded['nvim-autopairs'] then
|
||||||
|
-- return
|
||||||
function M.config()
|
-- end
|
||||||
lvim.builtin.autopairs = {
|
local Log = require "core.log"
|
||||||
active = true,
|
local status_ok, _ = pcall(require, "nvim-autopairs")
|
||||||
---@usage map <CR> on insert mode
|
if not status_ok then
|
||||||
map_cr = true,
|
Log:get_default().error "Failed to load autopairs"
|
||||||
---@usage auto insert after select function or method item,
|
return
|
||||||
map_complete = vim.bo.filetype ~= "tex",
|
|
||||||
---@usage check treesitter
|
|
||||||
check_ts = true,
|
|
||||||
ts_config = {
|
|
||||||
lua = { "string" },
|
|
||||||
javascript = { "template_string" },
|
|
||||||
java = false,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
end
|
end
|
||||||
|
local npairs = require "nvim-autopairs"
|
||||||
|
local Rule = require "nvim-autopairs.rule"
|
||||||
|
|
||||||
M.setup = function()
|
-- skip it, if you use another global object
|
||||||
-- skip it, if you use another global object
|
_G.MUtils = {}
|
||||||
_G.MUtils = {}
|
|
||||||
local npairs = require "nvim-autopairs"
|
|
||||||
local Rule = require "nvim-autopairs.rule"
|
|
||||||
|
|
||||||
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.autopairs_cr()
|
return npairs.esc "<cr>"
|
||||||
end
|
end
|
||||||
|
else
|
||||||
|
return npairs.autopairs_cr()
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if package.loaded["compe"] then
|
if package.loaded["compe"] then
|
||||||
require("nvim-autopairs.completion.compe").setup {
|
local map_complete_optional = vim.bo.filetype ~= "tex"
|
||||||
map_cr = lvim.builtin.autopairs.map_cr,
|
require("nvim-autopairs.completion.compe").setup {
|
||||||
map_complete = lvim.builtin.autopairs.map_complete,
|
map_cr = true, -- map <CR> on insert mode
|
||||||
}
|
map_complete = map_complete_optional, -- it will auto insert `(` after select function or method item
|
||||||
end
|
|
||||||
|
|
||||||
npairs.setup {
|
|
||||||
check_ts = lvim.builtin.autopairs.check_ts,
|
|
||||||
ts_config = lvim.builtin.autopairs.ts_config,
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
end
|
||||||
|
|
||||||
return M
|
npairs.setup {
|
||||||
|
check_ts = true,
|
||||||
|
ts_config = {
|
||||||
|
lua = { "string" }, -- it will not add pair on that treesitter node
|
||||||
|
javascript = { "template_string" },
|
||||||
|
java = false, -- don't check treesitter on java
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
require("nvim-treesitter.configs").setup { autopairs = { enable = true } }
|
||||||
|
|
||||||
|
local ts_conds = require "nvim-autopairs.ts-conds"
|
||||||
|
|
||||||
|
-- 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" }),
|
||||||
|
}
|
||||||
|
|
|
@ -1293,4 +1293,3 @@ 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()
|
|
||||||
|
|
|
@ -68,12 +68,11 @@ return {
|
||||||
-- event = "InsertEnter",
|
-- event = "InsertEnter",
|
||||||
after = "nvim-compe",
|
after = "nvim-compe",
|
||||||
config = function()
|
config = function()
|
||||||
require("core.autopairs").setup()
|
require "core.autopairs"
|
||||||
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
|
||||||
end,
|
end,
|
||||||
disable = not lvim.builtin.autopairs.active,
|
|
||||||
},
|
},
|
||||||
|
|
||||||
-- Treesitter
|
-- Treesitter
|
||||||
|
|
Loading…
Reference in a new issue