From f611dc2788d7f904148a4217646c82f006f19b25 Mon Sep 17 00:00:00 2001
From: Sam <130783534+Sam-programs@users.noreply.github.com>
Date: Tue, 19 Sep 2023 06:32:02 +0300
Subject: [PATCH] fix cr mapping change mode with <c-c> (#393)

* made the plugin move the cursor less

---------

Co-authored-by: Sam-programs <None>
---
 lua/nvim-autopairs.lua      |  6 ++----
 lua/nvim-autopairs/rule.lua | 11 +++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/lua/nvim-autopairs.lua b/lua/nvim-autopairs.lua
index dbf5910a..e46fdbfd 100644
--- a/lua/nvim-autopairs.lua
+++ b/lua/nvim-autopairs.lua
@@ -567,12 +567,10 @@ M.autopairs_cr = function(bufnr)
                 and rule:can_cr(cond_opt)
             then
                 local end_pair = rule:get_end_pair(cond_opt)
-                local end_pair_length = rule:get_end_pair_length(end_pair)
                 return utils.esc(
-                    end_pair
-                    .. utils.repeat_key(utils.key.join_left, end_pair_length)
+                    '<CR>' .. end_pair
                     -- FIXME do i need to re indent twice #118
-                    .. '<cr><esc>====O'
+                    .. '<CMD>normal ====k$<CR><right><CR>'
                 )
             end
 
diff --git a/lua/nvim-autopairs/rule.lua b/lua/nvim-autopairs/rule.lua
index 903098d6..9e900036 100644
--- a/lua/nvim-autopairs/rule.lua
+++ b/lua/nvim-autopairs/rule.lua
@@ -15,9 +15,9 @@ local Cond = require('nvim-autopairs.conds')
 --- @field is_undo boolean           add break undo sequence
 
 local Rule = setmetatable({}, {
-  __call = function(self, ...)
-    return self.new(...)
-  end,
+    __call = function(self, ...)
+        return self.new(...)
+    end,
 })
 
 ---@return Rule
@@ -114,9 +114,8 @@ function Rule:get_map_cr(opts)
     if self.map_cr_func then
         return self.map_cr_func(opts)
     end
-    return '<c-g>u<cr><c-c>==O'
+    return '<c-g>u<CR><CMD>normal ==k$<CR><right><CR>'
 end
-
 function Rule:replace_map_cr(value)
     self.map_cr_func = value
     return self
@@ -173,7 +172,7 @@ end
 ---@return Rule
 function Rule:with_pair(cond, pos)
     if self.pair_cond == nil then self.pair_cond = {} end
-    self.pair_cond[pos or (#self.pair_cond+1)] = cond
+    self.pair_cond[pos or (#self.pair_cond + 1)] = cond
     return self
 end