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/autopairs.lua') 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 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 "") + 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 "") + else + return npairs.esc "" + end else - return npairs.esc "" + 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 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/autopairs.lua') 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 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 From 4fd72b1be2c1220a519d5b8d58219939a11df0c9 Mon Sep 17 00:00:00 2001 From: abzcoding Date: Thu, 12 Aug 2021 12:05:54 +0430 Subject: Revert "Merge pull request #1294 from kylo252/autopairs-refactor" This reverts commit d71c3280c88c72665a21875522f0be3b157075b4, reversing changes made to a3344203818658441d176fe279e1978505940432. --- lua/core/autopairs.lua | 93 +++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 51 deletions(-) (limited to 'lua/core/autopairs.lua') diff --git a/lua/core/autopairs.lua b/lua/core/autopairs.lua index 9309bac9..a5f21a1b 100644 --- a/lua/core/autopairs.lua +++ b/lua/core/autopairs.lua @@ -1,63 +1,54 @@ -local M = {} - -function M.config() - lvim.builtin.autopairs = { - active = true, - ---@usage map on insert mode - map_cr = true, - ---@usage auto insert after select function or method item, - map_complete = vim.bo.filetype ~= "tex", - ---@usage check treesitter - check_ts = true, - ts_config = { - lua = { "string" }, - javascript = { "template_string" }, - java = false, - }, - } +-- 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 end +local npairs = require "nvim-autopairs" +local Rule = require "nvim-autopairs.rule" -M.setup = function() - -- skip it, if you use another global object - _G.MUtils = {} - local npairs = require "nvim-autopairs" - local Rule = require "nvim-autopairs.rule" +-- skip it, if you use another global object +_G.MUtils = {} - 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 "") - else - return npairs.esc "" - end +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 "") else - return npairs.autopairs_cr() + return npairs.esc "" end + else + return npairs.autopairs_cr() end +end - if package.loaded["compe"] then - 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, +if package.loaded["compe"] then + local map_complete_optional = vim.bo.filetype ~= "tex" + require("nvim-autopairs.completion.compe").setup { + map_cr = true, -- map on insert mode + map_complete = map_complete_optional, -- it will auto insert `(` after select function or method item } +end - require("nvim-treesitter.configs").setup { autopairs = { enable = true } } +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 + }, +} - local ts_conds = require "nvim-autopairs.ts-conds" +require("nvim-treesitter.configs").setup { autopairs = { enable = true } } - -- 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 +local ts_conds = require "nvim-autopairs.ts-conds" -return M +-- 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" }), +} -- cgit v1.2.3 From 335e707b2aae38c0cd5d0d962b27038ab1117aa6 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Tue, 17 Aug 2021 17:20:18 +0200 Subject: [Feature] Make the rest of the builtins configurable (#1318) --- lua/core/autopairs.lua | 94 ++++++++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 42 deletions(-) (limited to 'lua/core/autopairs.lua') diff --git a/lua/core/autopairs.lua b/lua/core/autopairs.lua index a5f21a1b..470f8335 100644 --- a/lua/core/autopairs.lua +++ b/lua/core/autopairs.lua @@ -1,54 +1,64 @@ --- 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 on insert mode + map_cr = true, + ---@usage auto insert after select function or method item + -- NOTE: This should be wrapped into a function so that it is re-evaluated when opening new files + map_complete = vim.bo.filetype ~= "tex", + ---@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 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 "") + 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 "") + else + return npairs.esc "" + end else - return npairs.esc "" + 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 on insert mode - map_complete = map_complete_optional, -- it will auto insert `(` after select function or method item + if package.loaded["compe"] then + 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 d85584d09f9028fa4202cea473f7f0ae3c531aef Mon Sep 17 00:00:00 2001 From: devtoi <508254+devtoi@users.noreply.github.com> Date: Sun, 22 Aug 2021 20:03:19 +0200 Subject: [Refactor/Bugfix] move on_config_done callbacks to relevant setup() (#1175) * Make autopairs config consistent with others * Fix two typos for autopairs * Remove extranous autopairs code. Return on setup * Remove extranous else for autopairs completion confirmation * Move on_config_done callbacks to setup functions. * Add on_config_done completion for builtins lacking a config function * enables galaxyline callbacks to work properly * Add modules for more builtins * Finish streamline of config function in plugin setup * Fix double use of which_key/wk * Fix erroneous remove of functionality in autopairs completion * consistency fixes * Work around telescope not found at config time * Match plugin definition of project and lualine with others * fix: restore config callback syntax Co-authored-by: Johan Melin Co-authored-by: rebuilt Co-authored-by: Luc Sinet Co-authored-by: kylo252 <59826753+kylo252@users.noreply.github.com> --- lua/core/autopairs.lua | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'lua/core/autopairs.lua') diff --git a/lua/core/autopairs.lua b/lua/core/autopairs.lua index 470f8335..24aa1875 100644 --- a/lua/core/autopairs.lua +++ b/lua/core/autopairs.lua @@ -3,6 +3,7 @@ local M = {} function M.config() lvim.builtin.autopairs = { active = true, + on_config_done = nil, ---@usage map on insert mode map_cr = true, ---@usage auto insert after select function or method item @@ -21,19 +22,19 @@ end M.setup = function() -- skip it, if you use another global object _G.MUtils = {} - local npairs = require "nvim-autopairs" + local autopairs = 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 "") + return vim.fn["compe#confirm"](autopairs.esc "") else - return npairs.esc "" + return autopairs.esc "" end else - return npairs.autopairs_cr() + return autopairs.autopairs_cr() end end @@ -44,7 +45,7 @@ M.setup = function() } end - npairs.setup { + autopairs.setup { check_ts = lvim.builtin.autopairs.check_ts, ts_config = lvim.builtin.autopairs.ts_config, } @@ -55,10 +56,14 @@ M.setup = function() -- TODO: can these rules be safely added from "config.lua" ? -- press % => %% is only inside comment or string - npairs.add_rules { + autopairs.add_rules { Rule("%", "%", "lua"):with_pair(ts_conds.is_ts_node { "string", "comment" }), Rule("$", "$", "lua"):with_pair(ts_conds.is_not_ts_node { "function" }), } + + if lvim.builtin.autopairs.on_config_done then + lvim.builtin.autopairs.on_config_done(autopairs) + end end return M -- cgit v1.2.3