fix: Find both local and global <CR> mapping for fallback

Author: kristijanhusak

lua/orgmode/config/init.lua

@@ -15,7 +15,6 @@ function Config:new(opts)
     opts = vim.tbl_deep_extend('force', defaults, opts or {}),
     todo_keywords = nil,
     ts_hl_enabled = nil,
-    old_cr_mapping = nil,
   }
   setmetatable(data, self)
   return data
@@ -261,12 +260,12 @@ function Config:get_todo_keywords()
 end
 
 --- Setup mappings for a given category and buffer
----@param category string Mapping category name (e.g. `agenda`, `capture`, `node`)
+---@param category string Mapping category name (e.g. `agenda`, `capture`, `org`)
 ---@param buffer number? Buffer id
 ---@see orgmode.config.mappings
 function Config:setup_mappings(category, buffer)
-  if not self.old_cr_mapping then
-    self.old_cr_mapping = utils.get_keymap({
+  if category == 'org' and vim.bo.filetype == 'org' and not vim.b.org_old_cr_mapping then
+    vim.b.org_old_cr_mapping = utils.get_keymap({
       mode = 'i',
       lhs = '<CR>',
       buffer = buffer,

lua/orgmode/config/mappings/map_entry.lua

@@ -21,9 +21,9 @@ function MapEntry.action(handler, opts)
     opts.args = nil
   end
 
-  action = ('<cmd>lua require("orgmode").action(%s)<CR>'):format(table.concat(action, ','))
+  local formatted_action = ('<cmd>lua require("orgmode").action(%s)<CR>'):format(table.concat(action, ','))
 
-  return MapEntry:new(action, opts)
+  return MapEntry:new(formatted_action, opts)
 end
 
 function MapEntry.text_object(handler)

lua/orgmode/org/mappings.lua

@@ -505,7 +505,7 @@ function OrgMappings:org_return()
     end
   end
 
-  local old_mapping = config.old_cr_mapping
+  local old_mapping = vim.b.org_old_cr_mapping
 
   -- No other mapping for <CR>, just reproduce it.
   if not old_mapping or vim.tbl_isempty(old_mapping) then

lua/orgmode/utils/init.lua

@@ -175,18 +175,25 @@ end
 ---@param data KeymapData
 ---@return table? map Mapping definition
 function utils.get_keymap(data)
-  local keymaps
+  local find_keymap = function(list)
+    for _, map in ipairs(list) do
+      if map.lhs == data.lhs then
+        return map
+      end
+    end
+  end
+
+  local keymap = nil
+
   if data.buffer then
-    keymaps = vim.api.nvim_buf_get_keymap(data.buffer, data.mode)
-  else
-    keymaps = vim.api.nvim_get_keymap(data.mode)
+    keymap = find_keymap(vim.api.nvim_buf_get_keymap(data.buffer, data.mode))
   end
 
-  for _, map in ipairs(keymaps) do
-    if map.lhs == data.lhs then
-      return map
-    end
+  if not keymap then
+    keymap = find_keymap(vim.api.nvim_get_keymap(data.mode))
   end
+
+  return keymap
 end
 
 function utils.esc(cmd)