fix(esupports.indent): keep indentation of verbatim blocks without an injected TS parser (#1685)

* fix(esupports.indent): keep indentation of verbatim blocks without an injected TS parser

* fix(promo): fix off-by-one error when re-indenting lines during range operation

`indent.reindent_range()` expects 0-based, exclusive line ranges, but the lines returned by
`nvim_buf_get_mark()` for the `<`/`>` marks are 1-based, inclusive line ranges

* fix(esupports.indent): fix setting indentation of line to -1 not being ignored

indent-expression might return -1 as the indentation of a line to indicate that
neovim should handle the indentation of the line. When manually setting the
indentation of a line with `buffer_set_line_indent` using the indentation
returned by indent-expression however, the -1 indentation caused the indentation
to be set to 0 instead of kept as is

Author: ALVAROPING1

lua/neorg/modules/core/esupports/indent/module.lua

@@ -96,6 +96,11 @@ module.public = {
             end
         end
 
+        -- Check if the code is within a verbatim block
+        local ranged_tag =
+            module.required["core.integrations.treesitter"].find_parent(node, "ranged_verbatim_tag_content")
+        indent_data = ranged_tag and module.config.public.indents[ranged_tag:type()] or indent_data
+
         -- Indents can be a static value, so account for that here
         if type(indent_data.indent) == "number" then
             -- If the indent is -1 then let Neovim indent instead of us
@@ -144,7 +149,7 @@ module.public = {
     ---@param new_indent number
     buffer_set_line_indent = function(buffer, start_row, new_indent)
         local line = vim.api.nvim_buf_get_lines(buffer, start_row, start_row + 1, true)[1]
-        if line:match("^%s*$") then
+        if line:match("^%s*$") or new_indent == -1 then
             return
         end
 
@@ -239,21 +244,27 @@ module.config.public = {
             indent = 0,
         },
 
-        ["ranged_tag"] = {
-            modifiers = { "under-headings" },
-            indent = 0,
-        },
-
         -- Ranged tag contents' indentation should be calculated by Neovim itself.
-        ["ranged_tag_content"] = {
+        ["ranged_verbatim_tag_content"] = {
             indent = -1,
         },
 
         -- `@end` tags should always be indented as far as the beginning `@` ranged verbatim tag.
+        ["ranged_verbatim_tag_end"] = {
+            modifiers = { "ranged-tag-end" },
+            indent = 0,
+        },
+
+        -- `|end` tags should always be indented as far as the beginning `|` ranged tag.
         ["ranged_tag_end"] = {
-            indent = function(_, node)
-                return module.required["core.integrations.treesitter"].get_node_range(node:parent()).column_start
-            end,
+            modifiers = { "ranged-tag-end" },
+            indent = 0,
+        },
+
+        -- `=end` tags should always be indented as far as the beginning `=` ranged tag.
+        ["macro_tag_end"] = {
+            modifiers = { "ranged-tag-end" },
+            indent = 0,
         },
     },
 
@@ -309,6 +320,11 @@ module.config.public = {
 
             return module.required["core.integrations.treesitter"].get_node_range(list:named_child(1)).column_start
         end,
+
+        -- For any ranged tag end that should always be indented as far as the beginning of the ranged tag
+        ["ranged-tag-end"] = function(_, node)
+            return module.required["core.integrations.treesitter"].get_node_range(node:parent()).column_start
+        end,
     },
 
     -- Tweaks are user defined `node_name` => `indent_level` mappings,

lua/neorg/modules/core/promo/module.lua

@@ -298,7 +298,7 @@ module.public = {
         for i = start_pos[1], end_pos[1] do
             module.private.promote_or_demote(buffer, "promote", i - 1, false, false)
         end
-        indent.reindent_range(buffer, start_pos[1], end_pos[1])
+        indent.reindent_range(buffer, start_pos[1] - 1, end_pos[1])
     end),
     demote = neorg.utils.wrap_dotrepeat(function()
         local buffer = vim.api.nvim_get_current_buf()
@@ -320,7 +320,7 @@ module.public = {
         for i = start_pos[1], end_pos[1] do
             module.private.promote_or_demote(buffer, "demote", i - 1, false, false)
         end
-        indent.reindent_range(buffer, start_pos[1], end_pos[1])
+        indent.reindent_range(buffer, start_pos[1] - 1, end_pos[1])
     end),
 }