From 2e8a10c5fc0dcaf8296a5f1a7077efcd37065cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Lito=C5=A1?=
 <54900518+JosefLitos@users.noreply.github.com>
Date: Sat, 17 Feb 2024 07:05:58 +0100
Subject: [PATCH] fix: avoid global variable usage (#426)

* fix: avoid global variable usage

* fix: replaced last occurence of `MPairs` global
---
 lua/nvim-autopairs.lua                  | 19 +++++++++----------
 lua/nvim-autopairs/completion/cmp.lua   |  2 +-
 lua/nvim-autopairs/completion/compe.lua | 14 +++++++-------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/lua/nvim-autopairs.lua b/lua/nvim-autopairs.lua
index cb7912c7..a9b88b4e 100644
--- a/lua/nvim-autopairs.lua
+++ b/lua/nvim-autopairs.lua
@@ -311,8 +311,8 @@ M.on_attach = function(bufnr)
             bufnr,
             'i',
             '<bs>',
-            'v:lua.MPairs.autopairs_bs()',
-            { expr = true, noremap = true }
+            '',
+            { callback = M.autopairs_bs, expr = true, noremap = true }
         )
     end
 
@@ -321,8 +321,8 @@ M.on_attach = function(bufnr)
             bufnr,
             "i",
             utils.key.c_h,
-            'v:lua.MPairs.autopairs_c_h()',
-            { expr = true, noremap = true }
+            '',
+            { callback = M.autopairs_c_h, expr = true, noremap = true }
         )
     end
 
@@ -331,8 +331,8 @@ M.on_attach = function(bufnr)
             bufnr,
             'i',
             '<c-w>',
-            'v:lua.MPairs.autopairs_c_w()',
-            { expr = true, noremap = true }
+            '',
+            { callback = M.autopairs_c_w, expr = true, noremap = true }
         )
     end
     api.nvim_buf_set_var(bufnr, 'nvim-autopairs', 1)
@@ -624,7 +624,7 @@ M.autopairs_afterquote = function(line, key_char)
                             append = 'la'
                         end
                         return utils.esc(
-                            '<esc><cmd>lua MPairs.autopairs_closequote_expr()<cr>' .. append
+                            "<esc><cmd>lua require'nvim-autopairs'.autopairs_closequote_expr()<cr>" .. append
                         )
                     end
                 end
@@ -654,11 +654,10 @@ M.map_cr = function()
     api.nvim_set_keymap(
         'i',
         '<CR>',
-        'v:lua.MPairs.completion_confirm()',
-        { expr = true, noremap = true }
+        '',
+        { callback = M.completion_confirm, expr = true, noremap = true }
     )
 end
 
 M.esc = utils.esc
-_G.MPairs = M
 return M
diff --git a/lua/nvim-autopairs/completion/cmp.lua b/lua/nvim-autopairs/completion/cmp.lua
index 0857c531..3d8d08c9 100644
--- a/lua/nvim-autopairs/completion/cmp.lua
+++ b/lua/nvim-autopairs/completion/cmp.lua
@@ -60,7 +60,7 @@ M.on_confirm_done = function(opts)
         if evt.commit_character then
           return
         end
-        
+
         local entry = evt.entry
         local commit_character = entry:get_commit_characters()
         local bufnr = vim.api.nvim_get_current_buf()
diff --git a/lua/nvim-autopairs/completion/compe.lua b/lua/nvim-autopairs/completion/compe.lua
index 333e2eaf..04cdb92d 100644
--- a/lua/nvim-autopairs/completion/compe.lua
+++ b/lua/nvim-autopairs/completion/compe.lua
@@ -7,7 +7,8 @@ local function_kind = nil
 
 local options = {}
 
-_G.MPairs.completion_done = function()
+local M = {}
+M.completion_done = function()
     local line = utils.text_get_current_line(0)
     local _, col = utils.get_cursor()
     local prev_char, next_char = utils.text_cusor_line(line, col, 1, 1, false)
@@ -40,7 +41,6 @@ _G.MPairs.completion_done = function()
     end
 end
 
-local M = {}
 M.setup = function(opt)
     opt = opt or { map_cr = true, map_complete = true, auto_select = false, map_char = {all = '('}}
     if not opt.map_char then opt.map_char = {} end
@@ -52,12 +52,12 @@ M.setup = function(opt)
         vim.api.nvim_set_keymap(
             'i',
             '<CR>',
-            'v:lua.MPairs.completion_confirm()',
-            { expr = true, noremap = true }
+            '',
+            { callback = M.completion_confirm, expr = true, noremap = true }
         )
     end
     if opt.auto_select then
-        _G.MPairs.completion_confirm = function()
+        M.completion_confirm = function()
             if vim.fn.pumvisible() ~= 0 then
                 return vim.fn['compe#confirm']({ keys = '<CR>', select = true })
             else
@@ -65,7 +65,7 @@ M.setup = function(opt)
             end
         end
     else
-        _G.MPairs.completion_confirm = function()
+        M.completion_confirm = function()
             if vim.fn.pumvisible() ~= 0 and vim.fn.complete_info()['selected'] ~= -1 then
                 return vim.fn['compe#confirm'](npairs.esc('<cr>'))
             else
@@ -78,7 +78,7 @@ M.setup = function(opt)
         vim.cmd([[
             augroup autopairs_compe
             autocmd!
-            autocmd User CompeConfirmDone call v:lua.MPairs.completion_done()
+            autocmd User CompeConfirmDone lua require'nvim-autopairs.completion.compe'.completion_done()
             augroup end
         ]])
     end