Merge pull request #50 from YousefHadder/refactor/phase2-split-list-module

refactor: split list module into focused sub-modules (Phase 2.2)

Author: YousefHadder

lua/markdown-plus/list/checkbox.lua

@@ -0,0 +1,142 @@
+-- Checkbox management module for markdown-plus.nvim
+local utils = require("markdown-plus.utils")
+local parser = require("markdown-plus.list.parser")
+local M = {}
+
+---Toggle checkbox on a specific line
+---@param line_num number 1-indexed line number
+function M.toggle_checkbox_on_line(line_num)
+  local line = utils.get_line(line_num)
+  if line == "" then
+    return
+  end
+
+  local list_info = parser.parse_list_line(line)
+
+  if not list_info then
+    return -- Not a list item, do nothing
+  end
+
+  local new_line = M.toggle_checkbox_in_line(line, list_info)
+  if new_line then
+    utils.set_line(line_num, new_line)
+  end
+end
+
+---Toggle checkbox state in a line
+---@param line string The line content
+---@param list_info table The parsed list information
+---@return string|nil The modified line, or nil if no change
+function M.toggle_checkbox_in_line(line, list_info)
+  if list_info.checkbox then
+    -- Has checkbox - toggle between checked/unchecked
+    return M.replace_checkbox_state(line, list_info)
+  else
+    -- No checkbox - add one
+    return M.add_checkbox_to_line(line, list_info)
+  end
+end
+
+---Replace checkbox state in a line
+---@param line string The line content
+---@param list_info table The parsed list information
+---@return string The modified line
+function M.replace_checkbox_state(line, list_info)
+  local indent = list_info.indent
+  local marker = list_info.marker
+
+  -- Find the checkbox pattern and extract the content after it
+  local checkbox_pattern = "^(" .. utils.escape_pattern(indent) .. utils.escape_pattern(marker) .. "%s*)%[.?%]%s*(.*)"
+
+  local prefix, content = line:match(checkbox_pattern)
+
+  if prefix and content ~= nil then
+    local current_state = list_info.checkbox
+    local new_state = (current_state == "x" or current_state == "X") and " " or "x"
+    return prefix .. "[" .. new_state .. "] " .. content
+  end
+
+  return line
+end
+
+---Add checkbox to a line that doesn't have one
+---@param line string The line content
+---@param list_info table The parsed list information
+---@return string The modified line
+function M.add_checkbox_to_line(line, list_info)
+  local indent = list_info.indent
+  local marker = list_info.marker
+
+  -- Pattern to match list item and capture content
+  local list_pattern = "^(" .. utils.escape_pattern(indent) .. utils.escape_pattern(marker) .. "%s*)(.*)"
+
+  local prefix, content = line:match(list_pattern)
+
+  if prefix and content ~= nil then
+    return prefix .. "[ ] " .. content
+  end
+
+  return line
+end
+
+---Toggle checkbox on current line (normal mode)
+function M.toggle_checkbox_line()
+  local cursor = utils.get_cursor()
+  local row = cursor[1]
+  M.toggle_checkbox_on_line(row)
+end
+
+---Toggle checkbox in visual range
+function M.toggle_checkbox_range()
+  local start_row = vim.fn.line("v")
+  local end_row = vim.fn.line(".")
+
+  if start_row == 0 or end_row == 0 then
+    return
+  end
+
+  -- Ensure start is before end
+  if start_row > end_row then
+    start_row, end_row = end_row, start_row
+  end
+
+  for row = start_row, end_row do
+    M.toggle_checkbox_on_line(row)
+  end
+end
+
+---Toggle checkbox in insert mode (maintains cursor position)
+function M.toggle_checkbox_insert()
+  local cursor = utils.get_cursor()
+  local row = cursor[1]
+  local col = cursor[2]
+
+  local old_line = utils.get_line(row)
+  M.toggle_checkbox_on_line(row)
+
+  -- Restore cursor position (adjusting for potential line length changes)
+  local new_line = utils.get_line(row)
+
+  -- Calculate the character delta to adjust cursor position
+  local old_len = #old_line
+  local new_len = #new_line
+  local delta = new_len - old_len
+
+  local new_col
+  -- Adjust cursor position by the delta to maintain visual position
+  if delta > 0 then
+    -- Characters were added (e.g., checkbox added), move cursor forward
+    new_col = math.min(col + delta, #new_line)
+  elseif delta < 0 then
+    -- Characters were removed (e.g., checkbox removed), move cursor backward
+    new_col = math.max(0, col + delta)
+    new_col = math.min(new_col, #new_line)
+  else
+    -- No change in length (e.g., toggling checkbox state)
+    new_col = math.min(col, #new_line)
+  end
+
+  vim.api.nvim_win_set_cursor(0, { row, new_col })
+end
+
+return M

lua/markdown-plus/list/handlers.lua

@@ -0,0 +1,252 @@
+-- List input handlers module for markdown-plus.nvim
+local utils = require("markdown-plus.utils")
+local parser = require("markdown-plus.list.parser")
+local M = {}
+
+---Extract content from a list line after the marker
+---@param line string The line to extract from
+---@param list_info table List information
+---@return string Content after the marker
+local function extract_list_content(line, list_info)
+  local marker_end = #list_info.indent + #list_info.full_marker
+  return line:sub(marker_end + 1):match("^%s*(.*)") or ""
+end
+
+---Break out of list (remove current empty item)
+---@param list_info table List information
+function M.break_out_of_list(list_info)
+  local cursor = utils.get_cursor()
+  local row = cursor[1]
+
+  -- Replace current line with just the indentation
+  utils.set_line(row, list_info.indent)
+
+  -- Position cursor at end of line
+  utils.set_cursor(row, #list_info.indent)
+end
+
+---Create next list item
+---@param list_info table List information
+function M.create_next_list_item(list_info)
+  local cursor = utils.get_cursor()
+  local row = cursor[1]
+
+  local next_marker = parser.get_next_marker(list_info)
+
+  -- Build next line
+  local next_line = list_info.indent .. next_marker .. " "
+  if list_info.checkbox then
+    next_line = next_line .. "[ ] "
+  end
+
+  -- Insert new line
+  utils.insert_line(row + 1, next_line)
+
+  -- Move cursor to new line at end
+  utils.set_cursor(row + 1, #next_line)
+end
+
+---Handle Enter key in lists
+function M.handle_enter()
+  local current_line = utils.get_current_line()
+  local cursor = utils.get_cursor()
+  local row, col = cursor[1], cursor[2]
+
+  -- Check if we're in a list
+  local list_info = parser.parse_list_line(current_line)
+
+  if not list_info then
+    -- Not in a list, simulate default Enter behavior
+    local line_before = current_line:sub(1, col)
+    local line_after = current_line:sub(col + 1)
+
+    utils.set_line(row, line_before)
+    utils.insert_line(row + 1, line_after)
+    utils.set_cursor(row + 1, 0)
+    return
+  end
+
+  -- Check if current list item is empty
+  if parser.is_empty_list_item(current_line, list_info) then
+    -- Empty list item - break out of list
+    M.break_out_of_list(list_info)
+    return
+  end
+
+  -- Create next list item
+  M.create_next_list_item(list_info)
+end
+
+---Handle Tab key for indentation
+function M.handle_tab()
+  local current_line = utils.get_current_line()
+  local list_info = parser.parse_list_line(current_line)
+
+  if not list_info then
+    -- Not in a list, insert a tab character or spaces
+    local cursor = utils.get_cursor()
+    local row, col = cursor[1], cursor[2]
+    local indent = string.rep(" ", vim.bo.shiftwidth or 2)
+    local new_line = current_line:sub(1, col) .. indent .. current_line:sub(col + 1)
+    utils.set_line(row, new_line)
+    utils.set_cursor(row, col + #indent)
+    return
+  end
+
+  -- Increase indentation
+  local cursor = utils.get_cursor()
+  local row, col = cursor[1], cursor[2]
+  local indent_size = vim.bo.shiftwidth
+
+  local new_indent = list_info.indent .. string.rep(" ", indent_size)
+  local content = extract_list_content(current_line, list_info)
+  local new_line = new_indent .. list_info.full_marker .. " " .. content
+
+  utils.set_line(row, new_line)
+  utils.set_cursor(row, col + indent_size)
+end
+
+---Handle Shift+Tab key for outdentation
+function M.handle_shift_tab()
+  local current_line = utils.get_current_line()
+  local list_info = parser.parse_list_line(current_line)
+
+  if not list_info then
+    -- Not a list line: remove up to shiftwidth spaces from start
+    local cursor = utils.get_cursor()
+    local row, col = cursor[1], cursor[2]
+    local indent_size = vim.bo.shiftwidth or 2
+    local leading = current_line:match("^(%s*)")
+    local to_remove = math.min(#leading, indent_size)
+    if to_remove > 0 then
+      local new_line = current_line:sub(to_remove + 1)
+      utils.set_line(row, new_line)
+      local new_col = math.max(0, col - to_remove)
+      utils.set_cursor(row, new_col)
+    end
+    return
+  end
+
+  -- Decrease indentation
+  local cursor = utils.get_cursor()
+  local row, col = cursor[1], cursor[2]
+  local indent_size = vim.bo.shiftwidth
+
+  -- Can't outdent if already at root level
+  if #list_info.indent < indent_size then
+    return
+  end
+
+  local new_indent = list_info.indent:sub(1, #list_info.indent - indent_size)
+  local content = extract_list_content(current_line, list_info)
+  local new_line = new_indent .. list_info.full_marker .. " " .. content
+
+  utils.set_line(row, new_line)
+
+  -- Adjust cursor position
+  local new_col = math.max(0, col - indent_size)
+  utils.set_cursor(row, new_col)
+end
+
+---Handle Backspace key
+function M.handle_backspace()
+  local current_line = utils.get_current_line()
+  local cursor = utils.get_cursor()
+  local row, col = cursor[1], cursor[2]
+
+  -- Check if we're in a list
+  local list_info = parser.parse_list_line(current_line)
+
+  if not list_info then
+    -- Not in a list, default backspace behavior
+    if col > 0 then
+      local new_line = current_line:sub(1, col - 1) .. current_line:sub(col + 1)
+      utils.set_line(row, new_line)
+      utils.set_cursor(row, col - 1)
+    elseif row > 1 then
+      -- At start of line, join with previous line
+      local prev_line = utils.get_line(row - 1)
+      local joined_line = prev_line .. current_line
+      vim.api.nvim_buf_set_lines(0, row - 2, row, false, { joined_line })
+      utils.set_cursor(row - 1, #prev_line)
+    end
+    return
+  end
+
+  -- If at the start of list content, remove the list marker
+  local marker_end_col = #list_info.indent + #list_info.full_marker + 1
+  if col <= marker_end_col and col > #list_info.indent then
+    -- Remove list marker, keep content
+    local content = extract_list_content(current_line, list_info)
+    utils.set_line(row, list_info.indent .. content)
+    utils.set_cursor(row, #list_info.indent)
+    return
+  end
+
+  -- Default backspace in list content
+  if col > 0 then
+    local new_line = current_line:sub(1, col - 1) .. current_line:sub(col + 1)
+    utils.set_line(row, new_line)
+    utils.set_cursor(row, col - 1)
+  end
+end
+
+---Handle normal mode 'o' key
+function M.handle_normal_o()
+  local current_line = utils.get_current_line()
+  local cursor = utils.get_cursor()
+  local row = cursor[1]
+
+  -- Check if current line is a list item
+  local list_info = parser.parse_list_line(current_line)
+
+  if not list_info then
+    -- Not in a list, insert blank line below and enter insert mode
+    utils.insert_line(row + 1, "")
+    utils.set_cursor(row + 1, 0)
+    vim.cmd("startinsert")
+    return
+  end
+
+  -- Create next list item below
+  local next_marker = parser.get_next_marker(list_info)
+  local next_line = list_info.indent .. next_marker .. " "
+  if list_info.checkbox then
+    next_line = next_line .. "[ ] "
+  end
+
+  utils.insert_line(row + 1, next_line)
+  utils.set_cursor(row + 1, #next_line)
+  vim.cmd("startinsert!")
+end
+
+---Handle normal mode 'O' key
+function M.handle_normal_O()
+  local current_line = utils.get_current_line()
+  local cursor = utils.get_cursor()
+  local row = cursor[1]
+
+  -- Check if current line is a list item
+  local list_info = parser.parse_list_line(current_line)
+
+  if not list_info then
+    -- Not in a list, insert blank line above and enter insert mode
+    utils.insert_line(row, "")
+    utils.set_cursor(row, 0)
+    vim.cmd("startinsert")
+    return
+  end
+
+  -- Insert list item above with previous marker
+  local prev_marker = parser.get_previous_marker(list_info, row)
+  local prev_line = list_info.indent .. prev_marker .. " "
+  if list_info.checkbox then
+    prev_line = prev_line .. "[ ] "
+  end
+
+  utils.insert_line(row, prev_line)
+  utils.set_cursor(row, #prev_line)
+  vim.cmd("startinsert!")
+end
+
+return M