Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(promo): promote/demote range + keybinds #1487

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(promo): promote/demote range + keybinds #1487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8792470
fix(promo): promote/demote range + keybinds
benlubas Jun 26, 2024
03e32bb
chore(promo): refactor indent functions into indent
benlubas Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions lua/neorg/modules/core/esupports/indent/module.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,31 @@ module.public = {

return new_indent
end,

---re-evaluate the indent expression for each line in the range, and apply the new indentation
---@param buffer number
---@param row_start number 0 based
---@param row_end number 0 based exclusive
reindent_range = function(buffer, row_start, row_end)
for i = row_start, row_end - 1 do
local indent_level = module.public.indentexpr(buffer, i)
module.public.buffer_set_line_indent(buffer, i, indent_level)
end
end,

---Set the indent of the given line to the new value
---@param buffer number
---@param start_row number 0 based
---@param new_indent number
buffer_set_line_indent = function(buffer, start_row, new_indent)
benlubas marked this conversation as resolved.
Show resolved Hide resolved
local line = vim.api.nvim_buf_get_lines(buffer, start_row, start_row + 1, true)[1]
if line:match("^%s*$") then
return
end

local leading_whitespace = line:match("^%s*"):len()
return vim.api.nvim_buf_set_text(buffer, start_row, 0, start_row, leading_whitespace, { (" "):rep(new_indent) })
end,
}

module.config.public = {
Expand Down
9 changes: 4 additions & 5 deletions lua/neorg/modules/core/keybinds/keybinds.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,10 @@ module.config.public = {
{ "<M-d>", "core.tempus.insert-date-insert-mode", opts = { desc = "[neorg] Insert Date" } },
},

-- TODO: Readd these
-- v = {
-- { ">>", ":<cr><cmd>Neorg keybind all core.promo.promote_range<cr>" },
-- { "<<", ":<cr><cmd>Neorg keybind all core.promo.demote_range<cr>" },
-- },
v = {
{ ">", "core.promo.promote_range", opts = { desc = "[neorg] Promote Objects in Range" } },
{ "<", "core.promo.demote_range", opts = { desc = "[neorg] Demote Objects in Range" } },
},
}, {
silent = true,
noremap = true,
Expand Down
88 changes: 18 additions & 70 deletions lua/neorg/modules/core/promo/module.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,21 @@ local neorg = require("neorg.core")
local modules = neorg.modules

local module = modules.create("core.promo")
local indent
benlubas marked this conversation as resolved.
Show resolved Hide resolved

module.setup = function()
return {
success = true,
requires = {
"core.integrations.treesitter",
"core.esupports.indent",
},
}
end

module.load = function()
---@type core.esupports.indent
indent = module.required["core.esupports.indent"]
modules.await("core.keybinds", function(keybinds)
keybinds.register_keybinds(
module.name,
Expand Down Expand Up @@ -79,6 +83,10 @@ module.private = {
"generic_list",
"quote",
},

get_line = function(buffer, target_row)
return vim.api.nvim_buf_get_lines(buffer, target_row, target_row + 1, true)[1]
end,
}

---@class core.promo
Expand All @@ -92,32 +100,6 @@ module.public = {
end,

promote_or_demote = function(buffer, mode, row, reindent_children, affect_children)
-- Vim buffer helpers
local function count_leading_whitespace(s)
return s:match("^%s*"):len()
end

local function get_line(target_row)
return vim.api.nvim_buf_get_lines(buffer, target_row, target_row + 1, true)[1]
end

local function buffer_set_line_indent(start_row, new_indent)
local line = get_line(start_row)

if line:match("^%s*$") then
return
end

return vim.api.nvim_buf_set_text(
buffer,
start_row,
0,
start_row,
count_leading_whitespace(line),
{ (" "):rep(new_indent) }
)
end

-- Treesitter node helpers
local function get_header_prefix_node(header_node)
local first_child = header_node:child(0)
Expand Down Expand Up @@ -145,14 +127,14 @@ module.public = {
end

local function is_quasi_prefix(target_row)
local line = get_line(target_row)
local line = module.private.get_line(buffer, target_row)
-- NOTE: This is a hardcoded check determined by the limitations of
-- the first generation treesitter parser.
return line:match("^%s*[%-~%*]+%s*$")
end

local function adjust_quasi_prefix(target_row, count)
local line = get_line(target_row)
local line = module.private.get_line(buffer, target_row)
local l, r = line:find("%S+")
assert(l)
assert(count ~= 0)
Expand Down Expand Up @@ -189,7 +171,7 @@ module.public = {
local current_visual_indent = vim.fn.indent(row + 1)
local new_indent = math.max(0, current_visual_indent + n_space_diff)
benlubas marked this conversation as resolved.
Show resolved Hide resolved

buffer_set_line_indent(row, new_indent)
indent.buffer_set_line_indent(buffer, row, new_indent)
return
end

Expand Down Expand Up @@ -288,19 +270,7 @@ module.public = {
return
end

local indent_module = modules.get_module("core.esupports.indent")
if not indent_module then
return
end

local function reindent_range(row_start, row_end)
for i = row_start, row_end - 1 do
local indent_level = indent_module.indentexpr(buffer, i)
buffer_set_line_indent(i, indent_level)
end
end

reindent_range(indent_row_start, indent_row_end)
indent.reindent_range(buffer, indent_row_start, indent_row_end)
end,
}

Expand All @@ -319,40 +289,18 @@ module.on_event = neorg.utils.wrap_dotrepeat(function(event)
local start_pos = vim.api.nvim_buf_get_mark(event.buffer, "<")
local end_pos = vim.api.nvim_buf_get_mark(event.buffer, ">")

for i = 0, end_pos[1] - start_pos[1] do
module.public.promote_or_demote(event.buffer, "promote", start_pos[1] + i)
end

if modules.loaded_modules["core.concealer"] then
benlubas marked this conversation as resolved.
Show resolved Hide resolved
modules.broadcast_event(
assert(
modules.create_event(
modules.loaded_modules["core.concealer"],
"core.concealer.events.update_region",
{ start = start_pos[1] - 1, ["end"] = end_pos[1] + 2 }
)
)
)
for i = start_pos[1], end_pos[1] do
module.public.promote_or_demote(event.buffer, "promote", i - 1, false, false)
end
indent.reindent_range(event.buffer, start_pos[1], end_pos[1])
elseif event.split_type[2] == "core.promo.demote_range" then
local start_pos = vim.api.nvim_buf_get_mark(event.buffer, "<")
local end_pos = vim.api.nvim_buf_get_mark(event.buffer, ">")

for i = 0, end_pos[1] - start_pos[1] do
module.public.promote_or_demote(event.buffer, "demote", start_pos[1] + i)
end

if modules.loaded_modules["core.concealer"] then
modules.broadcast_event(
assert(
modules.create_event(
modules.loaded_modules["core.concealer"],
"core.concealer.events.update_region",
{ start = start_pos[1] - 1, ["end"] = end_pos[1] + 2 }
)
)
)
for i = start_pos[1], end_pos[1] do
module.public.promote_or_demote(event.buffer, "demote", i - 1, false, false)
end
indent.reindent_range(event.buffer, start_pos[1], end_pos[1])
end
end)

Expand Down
Loading