From 1b5730d51195fee74f3544bd29d017c46da3dea3 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Wed, 11 Aug 2021 17:29:20 +0200
Subject: feat: make autopairs configurable

---
 lua/core/autopairs.lua | 95 ++++++++++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 42 deletions(-)

(limited to 'lua/core')

diff --git a/lua/core/autopairs.lua b/lua/core/autopairs.lua
index a5f21a1b..53572a5b 100644
--- a/lua/core/autopairs.lua
+++ b/lua/core/autopairs.lua
@@ -1,54 +1,65 @@
--- if not package.loaded['nvim-autopairs'] then
---   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
+local M = {}
+
+function M.config()
+  lvim.builtin.autopairs = {
+    active = true,
+    ---@usage  map <CR> on insert mode
+    map_cr = true,
+    ---@usage it will auto insert  after select function or method item,
+    map_complete = map_complete_optional,
+    ---@usage check treesitter
+    check_ts = true,
+    ts_config = {
+      lua = { "string" },
+      javascript = { "template_string" },
+      java = false,
+    },
+  }
 end
-local npairs = require "nvim-autopairs"
-local Rule = require "nvim-autopairs.rule"
 
--- skip it, if you use another global object
-_G.MUtils = {}
+M.setup = function()
+  -- skip it, if you use another global object
+  _G.MUtils = {}
+  local Log = require "core.log"
+  local npairs = require "nvim-autopairs"
+  local Rule = require "nvim-autopairs.rule"
 
-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>")
+  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.esc "<cr>"
+      return npairs.autopairs_cr()
     end
-  else
-    return npairs.autopairs_cr()
   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
+  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
+
+  npairs.setup {
+    check_ts = lvim.builtin.autopairs.check_ts,
+    ts_config = lvim.builtin.autopairs.ts_config,
   }
-end
 
-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 } }
 
-require("nvim-treesitter.configs").setup { autopairs = { enable = true } }
+  local ts_conds = require "nvim-autopairs.ts-conds"
 
-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
 
--- 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" }),
-}
+return M
-- 
cgit v1.2.3


From fb388d7ff81bdedf6e43c077dbf45e4288d45a49 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Wed, 11 Aug 2021 17:39:06 +0200
Subject: fix map_complete option

---
 lua/core/autopairs.lua | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lua/core')

diff --git a/lua/core/autopairs.lua b/lua/core/autopairs.lua
index 53572a5b..9309bac9 100644
--- a/lua/core/autopairs.lua
+++ b/lua/core/autopairs.lua
@@ -5,8 +5,8 @@ function M.config()
     active = true,
     ---@usage  map <CR> on insert mode
     map_cr = true,
-    ---@usage it will auto insert  after select function or method item,
-    map_complete = map_complete_optional,
+    ---@usage auto insert after select function or method item,
+    map_complete = vim.bo.filetype ~= "tex",
     ---@usage check treesitter
     check_ts = true,
     ts_config = {
@@ -20,7 +20,6 @@ end
 M.setup = function()
   -- skip it, if you use another global object
   _G.MUtils = {}
-  local Log = require "core.log"
   local npairs = require "nvim-autopairs"
   local Rule = require "nvim-autopairs.rule"
 
@@ -38,7 +37,6 @@ M.setup = function()
   end
 
   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,
-- 
cgit v1.2.3