oiupoyt/discordo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(config): reset style instead of merging for StyleWrapper (#759)

Browse source 
Co-authored-by: ayn2op <ayn2op@gmail.com>
This commit is contained in:
xqrs 2026-03-01 09:28:43 +03:00 • committed by GitHub
parent 745706b5d5
commit 66b81b765d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/config/theme.go
View file

@ -41,6 +41,9 @@ func (sw *StyleWrapper) UnmarshalTOML(v any) error {
return errInvalidType
}
// Reset on new styles
sw.Style = tcell.StyleDefault
for key, val := range m {
switch key {
case "foreground":

10
internal/markdown/renderer.go
View file

@ -76,8 +76,7 @@ func (r *Renderer) RenderLines(source []byte, node ast.Node, base tcell.Style) [
}
case *ast.AutoLink:
if entering {
style := ui.MergeStyle(currentStyle(), theme.URLStyle.Style)
builder.Write(string(node.URL(source)), style)
builder.Write(string(node.URL(source)), ui.MergeStyle(currentStyle(), theme.URLStyle.Style))
}
case *ast.Link:
if entering {
@ -119,14 +118,11 @@ func (r *Renderer) RenderLines(source []byte, node ast.Node, base tcell.Style) [
}
case *discordmd.Mention:
if entering {
style := ui.MergeStyle(currentStyle(), theme.MentionStyle.Style)
style = style.Bold(true)
builder.Write(mentionText(node), style)
builder.Write(mentionText(node), ui.MergeStyle(currentStyle(), theme.MentionStyle.Style))
}
case *discordmd.Emoji:
if entering {
style := ui.MergeStyle(currentStyle(), theme.EmojiStyle.Style)
builder.Write(":"+node.Name+":", style)
builder.Write(":"+node.Name+":", ui.MergeStyle(currentStyle(), theme.EmojiStyle.Style))
}
}
return ast.WalkContinue, nil