From 1ed739253485621d165341bcb69f857aa9d13a01 Mon Sep 17 00:00:00 2001 From: rob Date: Sun, 4 Jul 2021 15:07:11 +0100 Subject: Prevent startup errors on first run (#645) --- lua/lv-autopairs/init.lua | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lua/lv-autopairs/init.lua') diff --git a/lua/lv-autopairs/init.lua b/lua/lv-autopairs/init.lua index fb1300a2..54e14564 100644 --- a/lua/lv-autopairs/init.lua +++ b/lua/lv-autopairs/init.lua @@ -1,3 +1,7 @@ +if not package.loaded['nvim-autopairs'] then + return +end + local npairs = require('nvim-autopairs') local Rule = require('nvim-autopairs.rule') -- cgit v1.2.3 From 0d14b91e1e44bac124e796a82776085126699536 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 4 Jul 2021 10:22:16 -0400 Subject: seems to disable everything we may have to use a more complicated method --- lua/lv-autopairs/init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lua/lv-autopairs/init.lua') diff --git a/lua/lv-autopairs/init.lua b/lua/lv-autopairs/init.lua index 54e14564..a76f4537 100644 --- a/lua/lv-autopairs/init.lua +++ b/lua/lv-autopairs/init.lua @@ -1,6 +1,6 @@ -if not package.loaded['nvim-autopairs'] then - return -end +-- if not package.loaded['nvim-autopairs'] then +-- return +-- end local npairs = require('nvim-autopairs') local Rule = require('nvim-autopairs.rule') -- cgit v1.2.3 From be87f71c20e9e4074f0ea57ddfb7d4c699c3e8b6 Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Sun, 4 Jul 2021 12:32:11 -0400 Subject: more lazyload --- lua/lv-autopairs/init.lua | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) (limited to 'lua/lv-autopairs/init.lua') diff --git a/lua/lv-autopairs/init.lua b/lua/lv-autopairs/init.lua index a76f4537..057525a3 100644 --- a/lua/lv-autopairs/init.lua +++ b/lua/lv-autopairs/init.lua @@ -1,51 +1,47 @@ -- if not package.loaded['nvim-autopairs'] then -- return -- end - local npairs = require('nvim-autopairs') local Rule = require('nvim-autopairs.rule') -- skip it, if you use another global object -_G.MUtils= {} +_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("")) +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 - -require("nvim-autopairs.completion.compe").setup({ - map_cr = true, -- map on insert mode - map_complete = true -- it will auto insert `(` after select function or method item -}) +if package.loaded['compe'] then + require("nvim-autopairs.completion.compe").setup({ + map_cr = true, -- map on insert mode + map_complete = true -- it will auto insert `(` after select function or method item + }) +end npairs.setup({ check_ts = true, 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'}, - java = false,-- don't check treesitter on java + 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') -- 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'})) + 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 9f511bcb594b7e2461c97cb8182603928c773c2f Mon Sep 17 00:00:00 2001 From: Rafael Date: Sun, 4 Jul 2021 22:14:01 -0300 Subject: start formatting rules --- lua/lv-autopairs/init.lua | 56 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'lua/lv-autopairs/init.lua') diff --git a/lua/lv-autopairs/init.lua b/lua/lv-autopairs/init.lua index 057525a3..6a9e4286 100644 --- a/lua/lv-autopairs/init.lua +++ b/lua/lv-autopairs/init.lua @@ -1,47 +1,47 @@ -- if not package.loaded['nvim-autopairs'] then -- return -- end -local npairs = require('nvim-autopairs') -local Rule = require('nvim-autopairs.rule') +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 + 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 = true, -- map on insert mode - map_complete = true -- it will auto insert `(` after select function or method item - }) +if package.loaded["compe"] then + require("nvim-autopairs.completion.compe").setup { + map_cr = true, -- map on insert mode + map_complete = true, -- it will auto insert `(` after select function or method item + } 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 - } -}) +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" -- 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'})) -}) +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