Skip to content

Commit 68d672c

Browse files
chore: split main config to extend a state config, use in state module, avoids field duplication
1 parent ff2fcd6 commit 68d672c

6 files changed

Lines changed: 37 additions & 44 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
- check global Obsidian.opts for Obsidian.nvim in healthcheck [#633](https://github.com/MeanderingProgrammer/render-markdown.nvim/issues/633)
2121
[54d4b54](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/54d4b5431e9634ee3d8d30784e017239b5b89d41)
2222
- conceal padding spaces in multi-backtick code spans per CommonMark spec [#635](https://github.com/MeanderingProgrammer/render-markdown.nvim/pull/635)
23+
- false positive link matching [#650](https://github.com/MeanderingProgrammer/render-markdown.nvim/issues/650)
24+
[ff2fcd6](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/ff2fcd6f2c7b69ae2c08ebfb003b644b0d8b9acb)
2325

2426
### Collaborator Shoutouts
2527

lua/render-markdown/core/ui.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ function Updater:run()
9797
self.mode = env.mode.get() -- mode is only available after this point
9898
local render = self.config.enabled
9999
and self.config.resolved:render(self.mode)
100-
and not env.win.get(self.win, 'diff')
101100
and env.win.view(self.win).leftcol == 0
101+
and not env.win.get(self.win, 'diff')
102102
log.buf('info', 'Render', self.buf, render)
103103
local next_state = render and 'rendered' or 'default'
104104
for _, win in ipairs(env.buf.wins(self.buf)) do

lua/render-markdown/health.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ local state = require('render-markdown.state')
66
local M = {}
77

88
---@private
9-
M.version = '8.12.13'
9+
M.version = '8.12.14'
1010

1111
function M.check()
1212
M.start('versions')

lua/render-markdown/init.lua

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,9 @@ local settings = require('render-markdown.settings')
33
---@class render.md.Init: render.md.Api
44
local M = {}
55

6-
---@class (exact) render.md.Config: render.md.partial.Config
6+
---@class (exact) render.md.Config: render.md.partial.Config, render.md.state.Config
77
---@field preset render.md.config.Preset
8-
---@field log_level render.md.log.Level
9-
---@field log_runtime boolean
10-
---@field file_types string[]
11-
---@field max_file_size number
12-
---@field ignore fun(buf: integer): boolean
13-
---@field nested boolean
14-
---@field change_events string[]
15-
---@field restart_highlighter boolean
16-
---@field injections render.md.injection.Configs
17-
---@field patterns render.md.pattern.Configs
18-
---@field on render.md.on.Config
19-
---@field completions render.md.completions.Config
208
---@field overrides render.md.overrides.Config
21-
---@field custom_handlers table<string, render.md.Handler>
229

2310
---@class (exact) render.md.partial.Config: render.md.base.Config
2411
---@field debounce integer
@@ -43,6 +30,21 @@ local M = {}
4330
---@field win_options render.md.window.Configs
4431
---@field yaml render.md.yaml.Config
4532

33+
---@class (exact) render.md.state.Config
34+
---@field log_level render.md.log.Level
35+
---@field log_runtime boolean
36+
---@field file_types string[]
37+
---@field max_file_size number
38+
---@field ignore fun(buf: integer): boolean
39+
---@field nested boolean
40+
---@field change_events string[]
41+
---@field restart_highlighter boolean
42+
---@field injections render.md.injection.Configs
43+
---@field patterns render.md.pattern.Configs
44+
---@field on render.md.on.Config
45+
---@field completions render.md.completions.Config
46+
---@field custom_handlers table<string, render.md.Handler>
47+
4648
---@private
4749
---@type boolean
4850
M.initialized = false

lua/render-markdown/state.lua

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
11
local Config = require('render-markdown.lib.config')
22

3-
---@class render.md.State
3+
---@class render.md.State: render.md.state.Config
44
---@field private config render.md.Config
55
---@field enabled boolean
6-
---@field log_level render.md.log.Level
7-
---@field log_runtime boolean
8-
---@field file_types string[]
9-
---@field max_file_size number
10-
---@field ignore fun(buf: integer): boolean
11-
---@field nested boolean
12-
---@field change_events string[]
13-
---@field restart_highlighter boolean
14-
---@field injections table<string, render.md.injection.Config>
15-
---@field patterns table<string, render.md.pattern.Config>
16-
---@field on render.md.on.Config
17-
---@field completions render.md.completions.Config
18-
---@field custom_handlers table<string, render.md.Handler>
196
local M = {}
207

218
---@private

lua/render-markdown/types.lua

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
11
---@meta
22

3-
---@class (exact) render.md.UserConfig: render.md.partial.UserConfig
3+
---@class (exact) render.md.UserConfig: render.md.partial.UserConfig, render.md.state.UserConfig
44
---@field preset? render.md.config.Preset
5-
---@field log_level? render.md.log.Level
6-
---@field log_runtime? boolean
7-
---@field file_types? string[]
8-
---@field max_file_size? number
9-
---@field ignore? fun(buf: integer): boolean
10-
---@field nested? boolean
11-
---@field change_events? string[]
12-
---@field restart_highlighter? boolean
13-
---@field injections? render.md.injection.UserConfigs
14-
---@field patterns? render.md.pattern.UserConfigs
15-
---@field on? render.md.on.UserConfig
16-
---@field completions? render.md.completions.UserConfig
175
---@field overrides? render.md.overrides.UserConfig
18-
---@field custom_handlers? table<string, render.md.Handler>
196

207
---@class (exact) render.md.partial.UserConfig: render.md.base.UserConfig
218
---@field debounce? integer
@@ -40,6 +27,21 @@
4027
---@field win_options? render.md.window.UserConfigs
4128
---@field yaml? render.md.yaml.UserConfig
4229

30+
---@class (exact) render.md.state.UserConfig
31+
---@field log_level? render.md.log.Level
32+
---@field log_runtime? boolean
33+
---@field file_types? string[]
34+
---@field max_file_size? number
35+
---@field ignore? fun(buf: integer): boolean
36+
---@field nested? boolean
37+
---@field change_events? string[]
38+
---@field restart_highlighter? boolean
39+
---@field injections? render.md.injection.UserConfigs
40+
---@field patterns? render.md.pattern.UserConfigs
41+
---@field on? render.md.on.UserConfig
42+
---@field completions? render.md.completions.UserConfig
43+
---@field custom_handlers? table<string, render.md.Handler>
44+
4345
---@class (exact) render.md.anti.conceal.UserConfig
4446
---@field enabled? boolean
4547
---@field disabled_modes? render.md.Modes

0 commit comments

Comments
 (0)