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.

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

feat(concealer): hide comments #1229

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Changes from all commits
Commits
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
42 changes: 40 additions & 2 deletions lua/neorg/modules/core/concealer/module.lua
Original file line number Diff line number Diff line change
Expand Up @@ -555,9 +555,10 @@ module.public = {
return
end
local row_start_0b, col_start_0b, row_end_0bin, col_end_0bex = node:range()
local chop = config.chop and 1 or 0
for i = row_start_0b, row_end_0bin do
local l = i == row_start_0b and col_start_0b + 1 or 0
local r_ex = i == row_end_0bin and col_end_0bex - 1 or get_line_length(bufid, i)
local l = i == row_start_0b and col_start_0b + chop or 0
local r_ex = i == row_end_0bin and col_end_0bex - chop or get_line_length(bufid, i)
set_mark(bufid, i, l, config.icon:rep(r_ex - l), config.highlight)
end
end,
Expand All @@ -576,6 +577,20 @@ module.public = {
set_mark(bufid, row_start_0b, render_col_start_0b, config.icon:rep(len), config.highlight)
end,

carryover_dispatcher = function(config, bufid, node)
local tag_name = vim.treesitter.get_node_text(node:named_child(0), bufid)
assert(tag_name:sub(1,1) == "#")

local tag_handler = config.tag_types[tag_name:sub(2)]
if tag_handler then
tag_handler.renderer(tag_handler, bufid, node)
end
end,

carryover_comment = function(config, bufid, node)
module.public.icon_renderers.fill_multiline_chop2(config, bufid, node:parent())
end,

render_code_block = function(config, bufid, node)
local tag_name = vim.treesitter.get_node_text(node:named_child(0), bufid)
if not (tag_name == "code" or tag_name == "embed") then
Expand Down Expand Up @@ -920,6 +935,27 @@ module.config.public = {
highlight = "@neorg.markup.spoiler",
nodes = { "spoiler" },
render = module.public.icon_renderers.fill_multiline_chop2,
chop = true,
},

inline_comment = {
render = module.public.icon_renderers.fill_multiline_chop2,
nodes = { "inline_comment" },
icon = " ",
chop = true,
},
},

carryover = {
render = module.public.icon_renderers.carryover_dispatcher,
nodes = { "strong_carryover_set" },

tag_types = {
comment = {
icon = " ",
renderer = module.public.icon_renderers.carryover_comment,
chop = false,
},
},
},

Expand Down Expand Up @@ -1093,9 +1129,11 @@ local function get_parsed_query_lazy()
local keys = { "config", "icons" }
local function traverse_config(config, f)
if config == false then
-- disabled config
return
end
if config.nodes then
-- leaf config
f(config)
return
end
Expand Down
Loading