Add insert mode enter mapping

Author: kristijanhusak

lua/orgmode/clock/report.lua

@@ -42,7 +42,7 @@ function ClockReport:draw_for_agenda(start_line)
         headline.logbook:get_total(self.from, self.to):to_string(),
       })
     end
-    table.insert(data, {})
+    table.insert(data, 'hr')
   end
 
   local clock_table = Table.from_list(data, start_line):compile()

lua/orgmode/config/defaults.lua

@@ -119,6 +119,9 @@ return {
       org_promote_subtree = '<s',
       org_demote_subtree = '>s',
       org_meta_return = '<Leader><CR>', -- Add headling, item or row
+      org_return = {
+        i = '<CR>',
+      },
       org_insert_heading_respect_content = '<Leader>oih', -- Add new headling after current heading block with same level
       org_insert_todo_heading = '<Leader>oiT', -- Add new todo headling right after current heading with same level
       org_insert_todo_heading_respect_content = '<Leader>oit', -- Add new todo headling after current heading block on same level

lua/orgmode/config/init.lua

@@ -14,6 +14,7 @@ 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
@@ -174,6 +175,9 @@ function Config:get_todo_keywords()
 end
 
 function Config:setup_mappings(category)
+  if not self.old_cr_mapping then
+    self.old_cr_mapping = vim.fn.maparg('<CR>', 'i')
+  end
   if self.opts.mappings.disable_all then
     return
   end
@@ -203,7 +207,7 @@ function Config:setup_mappings(category)
   end
 
   for name, lhs in pairs(self.opts.mappings[category]) do
-    if mappings[category] and mappings[category][name] then
+    if mappings[category] and mappings[category][name] and lhs then
       local map = {}
       if type(mappings[category][name]) == 'table' and not vim.tbl_islist(mappings[category][name]) then
         -- multi-mode mapping

lua/orgmode/config/mappings.lua

@@ -67,6 +67,9 @@ return {
     org_move_subtree_up = { 'org_mappings.move_subtree_up' },
     org_move_subtree_down = { 'org_mappings.move_subtree_down' },
     org_export = { 'org_mappings.export' },
+    org_return = {
+      i = { 'org_mappings.org_return' },
+    },
     org_next_visible_heading = {
       n = { 'org_mappings.next_visible_heading' },
       x = { 'org_mappings.next_visible_heading' },

lua/orgmode/org/mappings.lua

@@ -11,6 +11,7 @@ local constants = require('orgmode.utils.constants')
 local ts_utils = require('nvim-treesitter.ts_utils')
 local utils = require('orgmode.utils')
 local ts_org = require('orgmode.treesitter')
+local ts_table = require('orgmode.treesitter.table')
 
 ---@class OrgMappings
 ---@field capture Capture
@@ -430,6 +431,21 @@ function OrgMappings:do_demote(whole_subtree)
   end
 end
 
+function OrgMappings:org_return()
+  local actions = {
+    ts_table.handle_cr,
+  }
+
+  for _, action in ipairs(actions) do
+    local handled = action()
+    if handled then
+      return
+    end
+  end
+
+  return vim.api.nvim_feedkeys(utils.esc(config.old_cr_mapping or '<CR>'), 'n', true)
+end
+
 function OrgMappings:handle_return(suffix)
   suffix = suffix or ''
   local current_file = Files.get_current_file()

lua/orgmode/parser/table/init.lua

@@ -27,22 +27,28 @@ function Table:new(opts)
 end
 
 ---@param row TableRow
+---@param at_position number?
 ---@return Table
-function Table:add_row(row)
-  table.insert(self.rows, row)
+function Table:add_row(row, at_position)
+  if at_position then
+    table.insert(self.rows, at_position, row)
+  else
+    table.insert(self.rows, row)
+  end
   for col_nr, cell in ipairs(row.cells) do
     if not self.cols_width[col_nr] or self.cols_width[col_nr] < cell.display_len then
       self.cols_width[col_nr] = cell.display_len
     end
   end
-  self.range.end_line = self.range.end_line + 1
+  self.range.end_line = self.range.start_line + #self.rows - 1
   return self
 end
 
 function Table:populate_missing_cells()
   for _, row in ipairs(self.rows) do
     row:populate_missing_cells()
   end
+  return self
 end
 
 ---@return Table

lua/orgmode/treesitter/table.lua

@@ -7,8 +7,26 @@ local query = vim.treesitter.query
 ---@class TsTable
 ---@field node userdata
 ---@field data table[]
+---@field tbl Table
 local TsTable = {}
 
+function TsTable.from_current_node()
+  vim.treesitter.get_parser(0, 'org', {}):parse()
+  local view = vim.fn.winsaveview()
+  -- Go to first non blank char
+  vim.cmd([[norm! _]])
+  local node = ts_utils.get_node_at_cursor()
+  vim.fn.winrestview(view)
+  if not node then
+    return false
+  end
+  local table_node = utils.get_closest_parent_of_type(node, 'table', true)
+  if not table_node then
+    return false
+  end
+  return TsTable:new({ node = table_node })
+end
+
 function TsTable:new(opts)
   local data = {}
   data.node = opts.node
@@ -43,43 +61,79 @@ function TsTable:_parse_data()
   end
 
   self.data = rows
+  local start_row, start_col = self.node:range()
+  self.tbl = Table.from_list(self.data, start_row + 1, start_col + 1)
 end
 
-function TsTable:rerender()
-  local start_row, start_col = self.node:range()
-  local tbl = Table.from_list(self.data, start_row + 1, start_col + 1)
+function TsTable:reformat()
+  local view = vim.fn.winsaveview()
+  vim.api.nvim_buf_set_lines(0, self.tbl.range.start_line - 1, self.tbl.range.end_line, false, self:_get_content())
+  vim.fn.winrestview(view)
+end
+
+---@private
+function TsTable:_get_content()
+  local start_row = self.node:range()
   local first_line = vim.api.nvim_buf_get_lines(0, start_row, start_row + 1, true)
   local indent = first_line and first_line[1]:match('^%s*') or ''
   indent = config:get_indent(indent:len())
 
-  local contents = tbl:draw()
+  local contents = self.tbl:draw()
   local indented = {}
   for _, content in ipairs(contents) do
     table.insert(indented, string.format('%s%s', indent, content))
   end
-  local view = vim.fn.winsaveview()
-  vim.api.nvim_buf_set_lines(0, tbl.range.start_line - 1, tbl.range.end_line - 1, false, indented)
-  vim.fn.winrestview(view)
-end
 
-local function format()
-  local view = vim.fn.winsaveview()
-  -- Go to first non blank char
-  vim.cmd([[norm! _]])
-  local node = ts_utils.get_node_at_cursor()
-  vim.fn.winrestview(view)
+  return indented
+end
 
+local function get_table_from_node(node)
   if not node then
     return false
   end
   local table_node = utils.get_closest_parent_of_type(node, 'table', true)
   if not table_node then
     return false
   end
-  TsTable:new({ node = table_node }):rerender()
+  return TsTable:new({ node = table_node })
+end
+
+function TsTable:add_row()
+  local line = vim.fn.line('.')
+  vim.api.nvim_buf_set_lines(0, line, line, true, { '|' })
+  return TsTable.from_current_node():reformat()
+end
+
+local function format()
+  local tbl = TsTable.from_current_node()
+
+  if not tbl then
+    return false
+  end
+
+  tbl:reformat()
+  return true
+end
+
+local function handle_cr()
+  if vim.fn.col('.') == vim.fn.col('$') then
+    return false
+  end
+  local tbl = TsTable.from_current_node()
+  if not tbl then
+    return false
+  end
+
+  tbl:add_row()
+  vim.api.nvim_feedkeys(utils.esc('<Down>'), 'n', true)
+  vim.schedule(function()
+    vim.cmd([[norm! F|]])
+    vim.api.nvim_feedkeys(utils.esc('<Right><Right>'), 'n', true)
+  end)
   return true
 end
 
 return {
   format = format,
+  handle_cr = handle_cr,
 }