chore(refactor): separate width enums for heading and code configurations

MeanderingProgrammer · MeanderingProgrammer · commit 6f5a4c36d938 · 2025-06-04T14:54:16.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
   [a1b0988](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/a1b0988f5ab26698afb56b9c2f0525a4de1195c1)
 - include highlight query files in checkhealth [4f05de7](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/4f05de7536571e231b66dd0363af347b162b5fd7)
 - pad suffix of latex so backgrounds are aligned [a212596](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/a2125961287c78dfc03cb628b7bed7f91b70fd45)
+- allow anti conceal to be disabled in specific modes [dd62056](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/dd620561843d5a62c917fffe77f2923c965d12c7)
 
 ### Bug Fixes
 
diff --git a/doc/render-markdown.txt b/doc/render-markdown.txt
@@ -1,4 +1,4 @@
-*render-markdown.txt*        For NVIM v0.11.2        Last change: 2025 June 02
+*render-markdown.txt*        For NVIM v0.11.2        Last change: 2025 June 04
 
 ==============================================================================
 Table of Contents                          *render-markdown-table-of-contents*
diff --git a/lua/render-markdown/config/base.lua b/lua/render-markdown/config/base.lua
@@ -7,12 +7,6 @@
 ---@class render.md.base.Cfg
 local M = {}
 
----@enum render.md.base.Width
-M.Width = {
-    full = 'full',
-    block = 'block',
-}
-
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
     spec:type('enabled', 'boolean')
diff --git a/lua/render-markdown/config/bullet.lua b/lua/render-markdown/config/bullet.lua
@@ -68,8 +68,7 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:nested_list('icons', 'string', 'function')
     spec:nested_list('ordered_icons', 'string', 'function')
     spec:type('left_pad', { 'number', 'function' })
diff --git a/lua/render-markdown/config/checkbox.lua b/lua/render-markdown/config/checkbox.lua
@@ -63,8 +63,7 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:type('bullet', 'boolean')
     spec:type('right_pad', 'number')
     spec:nested({ 'unchecked', 'checked' }, function(box)
diff --git a/lua/render-markdown/config/code.lua b/lua/render-markdown/config/code.lua
@@ -6,7 +6,7 @@
 ---@field language_icon boolean
 ---@field language_name boolean
 ---@field disable_background boolean|string[]
----@field width render.md.base.Width
+---@field width render.md.code.Width
 ---@field left_margin number
 ---@field left_pad number
 ---@field right_pad number
@@ -37,6 +37,12 @@ local Position = {
     right = 'right',
 }
 
+---@enum render.md.code.Width
+local Width = {
+    full = 'full',
+    block = 'block',
+}
+
 ---@enum render.md.code.Border
 local Border = {
     hide = 'hide',
@@ -124,16 +130,15 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:type('sign', 'boolean')
     spec:one_of('style', vim.tbl_values(Style))
     spec:one_of('position', vim.tbl_values(Position))
     spec:type('language_pad', 'number')
     spec:type('language_icon', 'boolean')
     spec:type('language_name', 'boolean')
     spec:list('disable_background', 'string', 'boolean')
-    spec:one_of('width', vim.tbl_values(Base.Width))
+    spec:one_of('width', vim.tbl_values(Width))
     spec:type('left_margin', 'number')
     spec:type('left_pad', 'number')
     spec:type('right_pad', 'number')
diff --git a/lua/render-markdown/config/dash.lua b/lua/render-markdown/config/dash.lua
@@ -32,8 +32,7 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:type('icon', 'string')
     spec:one_of('width', { 'full' }, 'number')
     spec:type('left_margin', 'number')
diff --git a/lua/render-markdown/config/document.lua b/lua/render-markdown/config/document.lua
@@ -26,8 +26,7 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:nested('conceal', function(conceal)
         conceal:list('char_patterns', 'string')
         conceal:list('line_patterns', 'string')
diff --git a/lua/render-markdown/config/heading.lua b/lua/render-markdown/config/heading.lua
@@ -5,7 +5,7 @@
 ---@field icons render.md.heading.String
 ---@field position render.md.heading.Position
 ---@field signs string[]
----@field width render.md.base.Width|(render.md.base.Width)[]
+---@field width render.md.heading.Width|(render.md.heading.Width)[]
 ---@field left_margin number|number[]
 ---@field left_pad number|number[]
 ---@field right_pad number|number[]
@@ -34,6 +34,12 @@ local Position = {
     right = 'right',
 }
 
+---@enum render.md.heading.Width
+local Width = {
+    full = 'full',
+    block = 'block',
+}
+
 ---@class (exact) render.md.heading.Custom
 ---@field pattern string
 ---@field icon? string
@@ -134,15 +140,14 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:type('atx', 'boolean')
     spec:type('setext', 'boolean')
     spec:type('sign', 'boolean')
     spec:list('icons', 'string', 'function')
     spec:one_of('position', vim.tbl_values(Position))
     spec:list('signs', 'string')
-    spec:one_or_list_of('width', vim.tbl_values(Base.Width))
+    spec:one_or_list_of('width', vim.tbl_values(Width))
     spec:list('left_margin', 'number', 'number')
     spec:list('left_pad', 'number', 'number')
     spec:list('right_pad', 'number', 'number')
diff --git a/lua/render-markdown/config/html.lua b/lua/render-markdown/config/html.lua
@@ -37,8 +37,7 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:nested('comment', function(comment)
         comment:type('conceal', 'boolean')
         comment:type('text', { 'string', 'nil' })
diff --git a/lua/render-markdown/config/indent.lua b/lua/render-markdown/config/indent.lua
@@ -32,8 +32,7 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:type('per_level', 'number')
     spec:type('skip_level', 'number')
     spec:type('skip_heading', 'boolean')
diff --git a/lua/render-markdown/config/inline_highlight.lua b/lua/render-markdown/config/inline_highlight.lua
@@ -19,8 +19,7 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:type('highlight', 'string')
     spec:check()
 end
diff --git a/lua/render-markdown/config/latex.lua b/lua/render-markdown/config/latex.lua
@@ -36,8 +36,7 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:type('converter', 'string')
     spec:type('highlight', 'string')
     spec:one_of('position', vim.tbl_values(Position))
diff --git a/lua/render-markdown/config/link.lua b/lua/render-markdown/config/link.lua
@@ -102,8 +102,7 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:nested('footnote', function(footnote)
         footnote:type('enabled', 'boolean')
         footnote:type('superscript', 'boolean')
diff --git a/lua/render-markdown/config/paragraph.lua b/lua/render-markdown/config/paragraph.lua
@@ -37,8 +37,7 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:type('left_margin', { 'number', 'function' })
     spec:type('indent', { 'number', 'function' })
     spec:type('min_width', 'number')
diff --git a/lua/render-markdown/config/pipe_table.lua b/lua/render-markdown/config/pipe_table.lua
@@ -88,8 +88,7 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:one_of('preset', vim.tbl_values(Preset))
     spec:one_of('style', vim.tbl_values(Style))
     spec:one_of('cell', vim.tbl_values(Cell))
diff --git a/lua/render-markdown/config/quote.lua b/lua/render-markdown/config/quote.lua
@@ -37,8 +37,7 @@ M.default = {
 
 ---@param spec render.md.debug.ValidatorSpec
 function M.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:list('icon', 'string', 'string')
     spec:type('repeat_linebreak', 'boolean')
     spec:list('highlight', 'string', 'string')
diff --git a/lua/render-markdown/core/manager.lua b/lua/render-markdown/core/manager.lua
@@ -46,10 +46,8 @@ function M.init()
         callback = function(args)
             for _, win in ipairs(vim.v.event.windows) do
                 local buf = Env.win.buf(win)
-                if M.attached(buf) then
-                    if state.get(buf).enabled then
-                        ui.update(buf, win, args.event, true)
-                    end
+                if M.attached(buf) and state.get(buf).enabled then
+                    ui.update(buf, win, args.event, true)
                 end
             end
         end,
diff --git a/lua/render-markdown/health.lua b/lua/render-markdown/health.lua
@@ -5,7 +5,7 @@ local state = require('render-markdown.state')
 local M = {}
 
 ---@private
-M.version = '8.4.12'
+M.version = '8.4.13'
 
 function M.check()
     M.start('version')
diff --git a/lua/render-markdown/lib/config.lua b/lua/render-markdown/lib/config.lua
@@ -81,8 +81,7 @@ end
 -- stylua: ignore
 ---@param spec render.md.debug.ValidatorSpec
 function Config.validate(spec)
-    local Base = require('render-markdown.config.base')
-    Base.validate(spec)
+    require('render-markdown.config.base').validate(spec)
     spec:type('max_file_size', 'number')
     spec:type('debounce', 'number')
     spec:nested('anti_conceal', require('render-markdown.config.anti_conceal').validate)
diff --git a/lua/render-markdown/render/markdown/heading.lua b/lua/render-markdown/render/markdown/heading.lua
@@ -12,7 +12,7 @@ local colors = require('render-markdown.core.colors')
 ---@field sign? string
 ---@field fg? string
 ---@field bg? string
----@field width render.md.base.Width
+---@field width render.md.heading.Width
 ---@field left_margin number
 ---@field left_pad number
 ---@field right_pad number
diff --git a/lua/render-markdown/types.lua b/lua/render-markdown/types.lua
@@ -89,7 +89,7 @@
 ---@field language_icon? boolean
 ---@field language_name? boolean
 ---@field disable_background? boolean|string[]
----@field width? render.md.base.Width
+---@field width? render.md.code.Width
 ---@field left_margin? number
 ---@field left_pad? number
 ---@field right_pad? number
@@ -139,7 +139,7 @@
 ---@field icons? render.md.heading.String
 ---@field position? render.md.heading.Position
 ---@field signs? string[]
----@field width? render.md.base.Width|(render.md.base.Width)[]
+---@field width? render.md.heading.Width|(render.md.heading.Width)[]
 ---@field left_margin? number|number[]
 ---@field left_pad? number|number[]
 ---@field right_pad? number|number[]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-render-markdown.txt For NVIM v0.11.2 Last change: 2025 June 02`
	`1`	`+render-markdown.txt For NVIM v0.11.2 Last change: 2025 June 04`
`2`	`2`
`3`	`3`	`==============================================================================`
`4`	`4`	`Table of Contents render-markdown-table-of-contents`