From 21b81ccb2716d73cde4eda805cf1f5ea1642412e Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 7 Apr 2019 03:22:51 +0300 Subject: Initial changes to do #91 --- ui/messages/parser/htmlparser.go | 226 ++++++++++++++++++++------------------- 1 file changed, 115 insertions(+), 111 deletions(-) (limited to 'ui/messages/parser/htmlparser.go') diff --git a/ui/messages/parser/htmlparser.go b/ui/messages/parser/htmlparser.go index f01d3cb..3d1548b 100644 --- a/ui/messages/parser/htmlparser.go +++ b/ui/messages/parser/htmlparser.go @@ -26,11 +26,11 @@ import ( "github.com/lucasb-eyer/go-colorful" "golang.org/x/net/html" + "maunium.net/go/gomuks/ui/messages" "maunium.net/go/mautrix" "maunium.net/go/tcell" "maunium.net/go/gomuks/matrix/rooms" - "maunium.net/go/gomuks/ui/messages/tstring" "maunium.net/go/gomuks/ui/widget" ) @@ -40,11 +40,6 @@ type htmlParser struct { room *rooms.Room } -type taggedTString struct { - tstring.TString - tag string -} - func AdjustStyleBold(style tcell.Style) tcell.Style { return style.Bold(true) } @@ -89,9 +84,9 @@ func digits(num int) int { return int(math.Floor(math.Log10(float64(num))) + 1) } -func (parser *htmlParser) listToTString(node *html.Node, stripLinebreak bool) tstring.TString { +func (parser *htmlParser) listToTString(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { ordered := node.Data == "ol" - taggedChildren := parser.nodeToTaggedTStrings(node.FirstChild, stripLinebreak) + listItems := parser.nodeToEntities(node.FirstChild, stripLinebreak) counter := 1 indentLength := 0 if ordered { @@ -100,13 +95,12 @@ func (parser *htmlParser) listToTString(node *html.Node, stripLinebreak bool) ts counter, _ = strconv.Atoi(start) } - longestIndex := (counter - 1) + len(taggedChildren) + longestIndex := (counter - 1) + len(listItems) indentLength = digits(longestIndex) } - indent := strings.Repeat(" ", indentLength+2) - var children []tstring.TString - for _, child := range taggedChildren { - if child.tag != "li" { + var children []*messages.HTMLEntity + for _, child := range listItems { + if child.Tag != "li" { continue } var prefix string @@ -116,31 +110,47 @@ func (parser *htmlParser) listToTString(node *html.Node, stripLinebreak bool) ts } else { prefix = "● " } - str := child.TString.Prepend(prefix) + child.Text = prefix + child.Text + child.Block = true + child.Indent = indentLength + 2 + children = append(children, child) counter++ - parts := str.Split('\n') - for i, part := range parts[1:] { - parts[i+1] = part.Prepend(indent) - } - str = tstring.Join(parts, "\n") - children = append(children, str) } - return tstring.Join(children, "\n") + return &messages.HTMLEntity{ + Tag: node.Data, + Text: "", + Style: tcell.StyleDefault, + Children: children, + Block: true, + Indent: 0, + } } -func (parser *htmlParser) basicFormatToTString(node *html.Node, stripLinebreak bool) tstring.TString { - str := parser.nodeToTagAwareTString(node.FirstChild, stripLinebreak) +func (parser *htmlParser) basicFormatToEntity(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { + entity := &messages.HTMLEntity{ + Tag: node.Data, + Children: parser.nodeToEntities(node.FirstChild, stripLinebreak), + } switch node.Data { case "b", "strong": - str.AdjustStyleFull(AdjustStyleBold) + entity.AdjustStyle(AdjustStyleBold) case "i", "em": - str.AdjustStyleFull(AdjustStyleItalic) + entity.AdjustStyle(AdjustStyleItalic) case "s", "del": - str.AdjustStyleFull(AdjustStyleStrikethrough) + entity.AdjustStyle(AdjustStyleStrikethrough) case "u", "ins": - str.AdjustStyleFull(AdjustStyleUnderline) + entity.AdjustStyle(AdjustStyleUnderline) + case "font": + fgColor, ok := parser.parseColor(node, "data-mx-color", "color") + if ok { + entity.AdjustStyle(AdjustStyleTextColor(fgColor)) + } + bgColor, ok := parser.parseColor(node, "data-mx-bg-color", "background-color") + if ok { + entity.AdjustStyle(AdjustStyleBackgroundColor(bgColor)) + } } - return str + return entity } func (parser *htmlParser) parseColor(node *html.Node, mainName, altName string) (color tcell.Color, ok bool) { @@ -165,98 +175,112 @@ func (parser *htmlParser) parseColor(node *html.Node, mainName, altName string) return tcell.NewRGBColor(int32(r), int32(g), int32(b)), true } -func (parser *htmlParser) fontToTString(node *html.Node, stripLinebreak bool) tstring.TString { - str := parser.nodeToTagAwareTString(node.FirstChild, stripLinebreak) - fgColor, ok := parser.parseColor(node, "data-mx-color", "color") - if ok { - str.AdjustStyleFull(AdjustStyleTextColor(fgColor)) - } - bgColor, ok := parser.parseColor(node, "data-mx-bg-color", "background-color") - if ok { - str.AdjustStyleFull(AdjustStyleBackgroundColor(bgColor)) - } - return str -} - -func (parser *htmlParser) headerToTString(node *html.Node, stripLinebreak bool) tstring.TString { - children := parser.nodeToTStrings(node.FirstChild, stripLinebreak) +func (parser *htmlParser) headerToEntity(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { length := int(node.Data[1] - '0') prefix := strings.Repeat("#", length) + " " - return tstring.Join(children, "").Prepend(prefix) + return (&messages.HTMLEntity{ + Tag: node.Data, + Text: prefix, + Children: parser.nodeToEntities(node.FirstChild, stripLinebreak), + }).AdjustStyle(AdjustStyleBold) } -func (parser *htmlParser) blockquoteToTString(node *html.Node, stripLinebreak bool) tstring.TString { - str := parser.nodeToTagAwareTString(node.FirstChild, stripLinebreak) - childrenArr := str.TrimSpace().Split('\n') - for index, child := range childrenArr { - childrenArr[index] = child.Prepend("> ") +func (parser *htmlParser) blockquoteToEntity(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { + return &messages.HTMLEntity{ + Tag: "blockquote", + Text: ">", + Children: parser.nodeToEntities(node.FirstChild, stripLinebreak), + Block: true, + Indent: 2, } - return tstring.Join(childrenArr, "\n") } -func (parser *htmlParser) linkToTString(node *html.Node, stripLinebreak bool) tstring.TString { - str := parser.nodeToTagAwareTString(node.FirstChild, stripLinebreak) +func (parser *htmlParser) linkToEntity(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { + entity := &messages.HTMLEntity{ + Tag: "a", + Children: parser.nodeToEntities(node.FirstChild, stripLinebreak), + } href := parser.getAttribute(node, "href") if len(href) == 0 { - return str + return entity } match := matrixToURL.FindStringSubmatch(href) if len(match) == 2 { + entity.Children = nil pillTarget := match[1] + entity.Text = pillTarget if pillTarget[0] == '@' { if member := parser.room.GetMember(pillTarget); member != nil { - return tstring.NewColorTString(member.Displayname, widget.GetHashColor(pillTarget)) + entity.Text = member.Displayname + entity.Style = entity.Style.Foreground(widget.GetHashColor(pillTarget)) } } - return tstring.NewTString(pillTarget) } - return str.Append(fmt.Sprintf(" (%s)", href)) + // TODO add click action for links + return entity } -func (parser *htmlParser) tagToTString(node *html.Node, stripLinebreak bool) tstring.TString { +func (parser *htmlParser) codeblockToEntity(node *html.Node) *messages.HTMLEntity { + return &messages.HTMLEntity{ + Tag: "pre", + Children: parser.nodeToEntities(node.FirstChild, false), + Block: true, + } +} + +func (parser *htmlParser) tagNodeToEntity(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { switch node.Data { case "blockquote": - return parser.blockquoteToTString(node, stripLinebreak) + return parser.blockquoteToEntity(node, stripLinebreak) case "ol", "ul": return parser.listToTString(node, stripLinebreak) case "h1", "h2", "h3", "h4", "h5", "h6": - return parser.headerToTString(node, stripLinebreak) + return parser.headerToEntity(node, stripLinebreak) case "br": - return tstring.NewTString("\n") - case "b", "strong", "i", "em", "s", "del", "u", "ins": - return parser.basicFormatToTString(node, stripLinebreak) - case "font": - return parser.fontToTString(node, stripLinebreak) + return &messages.HTMLEntity{Tag: "br", Block: true} + case "b", "strong", "i", "em", "s", "del", "u", "ins", "font": + return parser.basicFormatToEntity(node, stripLinebreak) case "a": - return parser.linkToTString(node, stripLinebreak) - case "p": - return parser.nodeToTagAwareTString(node.FirstChild, stripLinebreak).Append("\n") + return parser.linkToEntity(node, stripLinebreak) case "pre": - return parser.nodeToTString(node.FirstChild, false) + return parser.codeblockToEntity(node) default: - return parser.nodeToTagAwareTString(node.FirstChild, stripLinebreak) + return &messages.HTMLEntity{ + Tag: node.Data, + Children: parser.nodeToEntities(node.FirstChild, stripLinebreak), + Block: parser.isBlockTag(node.Data), + } } } -func (parser *htmlParser) singleNodeToTString(node *html.Node, stripLinebreak bool) taggedTString { +func (parser *htmlParser) singleNodeToEntity(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { switch node.Type { case html.TextNode: if stripLinebreak { node.Data = strings.Replace(node.Data, "\n", "", -1) } - return taggedTString{tstring.NewTString(node.Data), "text"} + return &messages.HTMLEntity{ + Tag: "text", + Text: node.Data, + } case html.ElementNode: - return taggedTString{parser.tagToTString(node, stripLinebreak), node.Data} + return parser.tagNodeToEntity(node, stripLinebreak) case html.DocumentNode: - return taggedTString{parser.nodeToTagAwareTString(node.FirstChild, stripLinebreak), "html"} + return &messages.HTMLEntity{ + Tag: "html", + Children: parser.nodeToEntities(node.FirstChild, stripLinebreak), + Block: true, + } default: - return taggedTString{tstring.NewBlankTString(), "unknown"} + return nil } } -func (parser *htmlParser) nodeToTaggedTStrings(node *html.Node, stripLinebreak bool) (strs []taggedTString) { +func (parser *htmlParser) nodeToEntities(node *html.Node, stripLinebreak bool) (entities []*messages.HTMLEntity) { for ; node != nil; node = node.NextSibling { - strs = append(strs, parser.singleNodeToTString(node, stripLinebreak)) + if entity := parser.singleNodeToEntity(node, stripLinebreak); entity != nil { + entities = append(entities, entity) + } } return } @@ -272,51 +296,31 @@ func (parser *htmlParser) isBlockTag(tag string) bool { return false } -func (parser *htmlParser) nodeToTagAwareTString(node *html.Node, stripLinebreak bool) tstring.TString { - strs := parser.nodeToTaggedTStrings(node, stripLinebreak) - output := tstring.NewBlankTString() - for _, str := range strs { - tstr := str.TString - if parser.isBlockTag(str.tag) { - tstr = tstr.Prepend("\n").Append("\n") - } - output = output.AppendTString(tstr) - } - return output.TrimSpace() -} - -func (parser *htmlParser) nodeToTStrings(node *html.Node, stripLinebreak bool) (strs []tstring.TString) { - for ; node != nil; node = node.NextSibling { - strs = append(strs, parser.singleNodeToTString(node, stripLinebreak).TString) - } - return -} - -func (parser *htmlParser) nodeToTString(node *html.Node, stripLinebreak bool) tstring.TString { - return tstring.Join(parser.nodeToTStrings(node, stripLinebreak), "") -} - -func (parser *htmlParser) Parse(htmlData string) tstring.TString { +func (parser *htmlParser) Parse(htmlData string) *messages.HTMLEntity { node, _ := html.Parse(strings.NewReader(htmlData)) - return parser.nodeToTagAwareTString(node, true) + return parser.singleNodeToEntity(node, true) } // ParseHTMLMessage parses a HTML-formatted Matrix event into a UIMessage. -func ParseHTMLMessage(room *rooms.Room, evt *mautrix.Event, senderDisplayname string) tstring.TString { +func ParseHTMLMessage(room *rooms.Room, evt *mautrix.Event, senderDisplayname string) *messages.HTMLEntity { htmlData := evt.Content.FormattedBody htmlData = strings.Replace(htmlData, "\t", " ", -1) parser := htmlParser{room} - str := parser.Parse(htmlData) + root := parser.Parse(htmlData) + root.Block = false if evt.Content.MsgType == mautrix.MsgEmote { - str = tstring.Join([]tstring.TString{ - tstring.NewTString("* "), - tstring.NewColorTString(senderDisplayname, widget.GetHashColor(evt.Sender)), - tstring.NewTString(" "), - str, - }, "") + root = &messages.HTMLEntity{ + Tag: "emote", + Children: []*messages.HTMLEntity{ + {Text: "* "}, + {Text: senderDisplayname, Style: tcell.StyleDefault.Foreground(widget.GetHashColor(evt.Sender))}, + {Text: " "}, + root, + }, + } } - return str + return root } -- cgit v1.2.3 From b0c4ef81e9a1c7d9376685875d795ad3b5d8db01 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 7 Apr 2019 18:21:38 +0300 Subject: More changes to do #91 --- ui/messages/parser/htmlparser.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ui/messages/parser/htmlparser.go') diff --git a/ui/messages/parser/htmlparser.go b/ui/messages/parser/htmlparser.go index 3d1548b..9a9c2d1 100644 --- a/ui/messages/parser/htmlparser.go +++ b/ui/messages/parser/htmlparser.go @@ -266,6 +266,9 @@ func (parser *htmlParser) singleNodeToEntity(node *html.Node, stripLinebreak boo case html.ElementNode: return parser.tagNodeToEntity(node, stripLinebreak) case html.DocumentNode: + if node.FirstChild.Data == "html" && node.FirstChild.NextSibling == nil { + return parser.singleNodeToEntity(node.FirstChild, stripLinebreak) + } return &messages.HTMLEntity{ Tag: "html", Children: parser.nodeToEntities(node.FirstChild, stripLinebreak), -- cgit v1.2.3 From cf93671ecdebc96cfd45fefaeb9fc95f62393a33 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 7 Apr 2019 20:13:23 +0300 Subject: Add syntax highlighting. Fixes #28 --- ui/messages/parser/htmlparser.go | 95 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 3 deletions(-) (limited to 'ui/messages/parser/htmlparser.go') diff --git a/ui/messages/parser/htmlparser.go b/ui/messages/parser/htmlparser.go index 9a9c2d1..688deb3 100644 --- a/ui/messages/parser/htmlparser.go +++ b/ui/messages/parser/htmlparser.go @@ -23,6 +23,9 @@ import ( "strconv" "strings" + "github.com/alecthomas/chroma" + "github.com/alecthomas/chroma/lexers" + "github.com/alecthomas/chroma/styles" "github.com/lucasb-eyer/go-colorful" "golang.org/x/net/html" @@ -216,18 +219,102 @@ func (parser *htmlParser) linkToEntity(node *html.Node, stripLinebreak bool) *me } } } - // TODO add click action for links + // TODO add click action and underline on hover for links return entity } -func (parser *htmlParser) codeblockToEntity(node *html.Node) *messages.HTMLEntity { +func (parser *htmlParser) imageToEntity(node *html.Node) *messages.HTMLEntity { + alt := parser.getAttribute(node, "alt") + if len(alt) == 0 { + alt = parser.getAttribute(node, "title") + if len(alt) == 0 { + alt = "[inline image]" + } + } + entity := &messages.HTMLEntity{ + Tag: "img", + Text: alt, + } + // TODO add click action and underline on hover for inline images + return entity +} + +func colourToColor(colour chroma.Colour) tcell.Color { + if !colour.IsSet() { + return tcell.ColorDefault + } + return tcell.NewRGBColor(int32(colour.Red()), int32(colour.Green()), int32(colour.Blue())) +} + +func styleEntryToStyle(se chroma.StyleEntry) tcell.Style { + return tcell.StyleDefault. + Bold(se.Bold == chroma.Yes). + Italic(se.Italic == chroma.Yes). + Underline(se.Underline == chroma.Yes). + Foreground(colourToColor(se.Colour)). + Background(colourToColor(se.Background)) +} + +func (parser *htmlParser) syntaxHighlight(text, language string) *messages.HTMLEntity { + lexer := lexers.Get(language) + if lexer == nil { + return nil + } + iter, err := lexer.Tokenise(nil, text) + if err != nil { + return nil + } + style := styles.SolarizedDark + tokens := iter.Tokens() + children := make([]*messages.HTMLEntity, len(tokens)) + for i, token := range tokens { + if token.Value == "\n" { + children[i] = &messages.HTMLEntity{Block: true, Tag: "br"} + } else { + children[i] = &messages.HTMLEntity{ + Tag: token.Type.String(), + Text: token.Value, + Style: styleEntryToStyle(style.Get(token.Type)), + + DefaultHeight: 1, + } + } + } return &messages.HTMLEntity{ Tag: "pre", - Children: parser.nodeToEntities(node.FirstChild, false), Block: true, + Children: children, } } +func (parser *htmlParser) codeblockToEntity(node *html.Node) *messages.HTMLEntity { + entity := &messages.HTMLEntity{ + Tag: "pre", + Block: true, + } + // TODO allow disabling syntax highlighting + if node.FirstChild.Type == html.ElementNode && node.FirstChild.Data == "code" { + text := (&messages.HTMLEntity{ + Children: parser.nodeToEntities(node.FirstChild.FirstChild, false), + }).PlainText() + attr := parser.getAttribute(node.FirstChild, "class") + var lang string + for _, class := range strings.Split(attr, " ") { + if strings.HasPrefix(class, "language-") { + lang = class[len("language-"):] + break + } + } + if len(lang) != 0 { + if parsed := parser.syntaxHighlight(text, lang); parsed != nil { + return parsed + } + } + } + entity.Children = parser.nodeToEntities(node.FirstChild, false) + return entity +} + func (parser *htmlParser) tagNodeToEntity(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { switch node.Data { case "blockquote": @@ -242,6 +329,8 @@ func (parser *htmlParser) tagNodeToEntity(node *html.Node, stripLinebreak bool) return parser.basicFormatToEntity(node, stripLinebreak) case "a": return parser.linkToEntity(node, stripLinebreak) + case "img": + return parser.imageToEntity(node) case "pre": return parser.codeblockToEntity(node) default: -- cgit v1.2.3 From e6180c9b6fb12686926cf8d3bc27f31f6489129b Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 7 Apr 2019 22:25:53 +0300 Subject: Move special list/blockquote prefixing to renderer --- ui/messages/parser/htmlparser.go | 135 +++++++++++++++------------------------ 1 file changed, 50 insertions(+), 85 deletions(-) (limited to 'ui/messages/parser/htmlparser.go') diff --git a/ui/messages/parser/htmlparser.go b/ui/messages/parser/htmlparser.go index 688deb3..464459e 100644 --- a/ui/messages/parser/htmlparser.go +++ b/ui/messages/parser/htmlparser.go @@ -17,8 +17,6 @@ package parser import ( - "fmt" - "math" "regexp" "strconv" "strings" @@ -29,11 +27,11 @@ import ( "github.com/lucasb-eyer/go-colorful" "golang.org/x/net/html" - "maunium.net/go/gomuks/ui/messages" "maunium.net/go/mautrix" "maunium.net/go/tcell" "maunium.net/go/gomuks/matrix/rooms" + "maunium.net/go/gomuks/ui/messages" "maunium.net/go/gomuks/ui/widget" ) @@ -80,57 +78,30 @@ func (parser *htmlParser) getAttribute(node *html.Node, attribute string) string return "" } -func digits(num int) int { - if num <= 0 { - return 0 - } - return int(math.Floor(math.Log10(float64(num))) + 1) -} - -func (parser *htmlParser) listToTString(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { +func (parser *htmlParser) listToEntity(node *html.Node, stripLinebreak bool) messages.HTMLEntity { + children := parser.nodeToEntities(node.FirstChild, stripLinebreak) ordered := node.Data == "ol" - listItems := parser.nodeToEntities(node.FirstChild, stripLinebreak) - counter := 1 - indentLength := 0 + start := 1 if ordered { - start := parser.getAttribute(node, "start") - if len(start) > 0 { - counter, _ = strconv.Atoi(start) + if startRaw := parser.getAttribute(node, "start"); len(startRaw) > 0 { + var err error + start, err = strconv.Atoi(startRaw) + if err != nil { + start = 1 + } } - - longestIndex := (counter - 1) + len(listItems) - indentLength = digits(longestIndex) } - var children []*messages.HTMLEntity - for _, child := range listItems { - if child.Tag != "li" { - continue - } - var prefix string - if ordered { - indexPadding := indentLength - digits(counter) - prefix = fmt.Sprintf("%d. %s", counter, strings.Repeat(" ", indexPadding)) - } else { - prefix = "● " + listItems := children[:0] + for _, child := range children { + if child.GetTag() == "li" { + listItems = append(listItems, child) } - child.Text = prefix + child.Text - child.Block = true - child.Indent = indentLength + 2 - children = append(children, child) - counter++ - } - return &messages.HTMLEntity{ - Tag: node.Data, - Text: "", - Style: tcell.StyleDefault, - Children: children, - Block: true, - Indent: 0, } + return messages.NewListEntity(ordered, start, listItems) } -func (parser *htmlParser) basicFormatToEntity(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { - entity := &messages.HTMLEntity{ +func (parser *htmlParser) basicFormatToEntity(node *html.Node, stripLinebreak bool) messages.HTMLEntity { + entity := &messages.BaseHTMLEntity{ Tag: node.Data, Children: parser.nodeToEntities(node.FirstChild, stripLinebreak), } @@ -178,28 +149,22 @@ func (parser *htmlParser) parseColor(node *html.Node, mainName, altName string) return tcell.NewRGBColor(int32(r), int32(g), int32(b)), true } -func (parser *htmlParser) headerToEntity(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { +func (parser *htmlParser) headerToEntity(node *html.Node, stripLinebreak bool) messages.HTMLEntity { length := int(node.Data[1] - '0') prefix := strings.Repeat("#", length) + " " - return (&messages.HTMLEntity{ + return (&messages.BaseHTMLEntity{ Tag: node.Data, Text: prefix, Children: parser.nodeToEntities(node.FirstChild, stripLinebreak), }).AdjustStyle(AdjustStyleBold) } -func (parser *htmlParser) blockquoteToEntity(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { - return &messages.HTMLEntity{ - Tag: "blockquote", - Text: ">", - Children: parser.nodeToEntities(node.FirstChild, stripLinebreak), - Block: true, - Indent: 2, - } +func (parser *htmlParser) blockquoteToEntity(node *html.Node, stripLinebreak bool) messages.HTMLEntity { + return messages.NewBlockquoteEntity(parser.nodeToEntities(node.FirstChild, stripLinebreak)) } -func (parser *htmlParser) linkToEntity(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { - entity := &messages.HTMLEntity{ +func (parser *htmlParser) linkToEntity(node *html.Node, stripLinebreak bool) messages.HTMLEntity { + entity := &messages.BaseHTMLEntity{ Tag: "a", Children: parser.nodeToEntities(node.FirstChild, stripLinebreak), } @@ -223,7 +188,7 @@ func (parser *htmlParser) linkToEntity(node *html.Node, stripLinebreak bool) *me return entity } -func (parser *htmlParser) imageToEntity(node *html.Node) *messages.HTMLEntity { +func (parser *htmlParser) imageToEntity(node *html.Node) messages.HTMLEntity { alt := parser.getAttribute(node, "alt") if len(alt) == 0 { alt = parser.getAttribute(node, "title") @@ -231,7 +196,7 @@ func (parser *htmlParser) imageToEntity(node *html.Node) *messages.HTMLEntity { alt = "[inline image]" } } - entity := &messages.HTMLEntity{ + entity := &messages.BaseHTMLEntity{ Tag: "img", Text: alt, } @@ -255,7 +220,7 @@ func styleEntryToStyle(se chroma.StyleEntry) tcell.Style { Background(colourToColor(se.Background)) } -func (parser *htmlParser) syntaxHighlight(text, language string) *messages.HTMLEntity { +func (parser *htmlParser) syntaxHighlight(text, language string) messages.HTMLEntity { lexer := lexers.Get(language) if lexer == nil { return nil @@ -266,12 +231,12 @@ func (parser *htmlParser) syntaxHighlight(text, language string) *messages.HTMLE } style := styles.SolarizedDark tokens := iter.Tokens() - children := make([]*messages.HTMLEntity, len(tokens)) + children := make([]messages.HTMLEntity, len(tokens)) for i, token := range tokens { if token.Value == "\n" { - children[i] = &messages.HTMLEntity{Block: true, Tag: "br"} + children[i] = &messages.BaseHTMLEntity{Block: true, Tag: "br"} } else { - children[i] = &messages.HTMLEntity{ + children[i] = &messages.BaseHTMLEntity{ Tag: token.Type.String(), Text: token.Value, Style: styleEntryToStyle(style.Get(token.Type)), @@ -280,21 +245,21 @@ func (parser *htmlParser) syntaxHighlight(text, language string) *messages.HTMLE } } } - return &messages.HTMLEntity{ + return &messages.BaseHTMLEntity{ Tag: "pre", Block: true, Children: children, } } -func (parser *htmlParser) codeblockToEntity(node *html.Node) *messages.HTMLEntity { - entity := &messages.HTMLEntity{ +func (parser *htmlParser) codeblockToEntity(node *html.Node) messages.HTMLEntity { + entity := &messages.BaseHTMLEntity{ Tag: "pre", Block: true, } // TODO allow disabling syntax highlighting if node.FirstChild.Type == html.ElementNode && node.FirstChild.Data == "code" { - text := (&messages.HTMLEntity{ + text := (&messages.BaseHTMLEntity{ Children: parser.nodeToEntities(node.FirstChild.FirstChild, false), }).PlainText() attr := parser.getAttribute(node.FirstChild, "class") @@ -315,16 +280,16 @@ func (parser *htmlParser) codeblockToEntity(node *html.Node) *messages.HTMLEntit return entity } -func (parser *htmlParser) tagNodeToEntity(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { +func (parser *htmlParser) tagNodeToEntity(node *html.Node, stripLinebreak bool) messages.HTMLEntity { switch node.Data { case "blockquote": return parser.blockquoteToEntity(node, stripLinebreak) case "ol", "ul": - return parser.listToTString(node, stripLinebreak) + return parser.listToEntity(node, stripLinebreak) case "h1", "h2", "h3", "h4", "h5", "h6": return parser.headerToEntity(node, stripLinebreak) case "br": - return &messages.HTMLEntity{Tag: "br", Block: true} + return &messages.BaseHTMLEntity{Tag: "br", Block: true} case "b", "strong", "i", "em", "s", "del", "u", "ins", "font": return parser.basicFormatToEntity(node, stripLinebreak) case "a": @@ -334,7 +299,7 @@ func (parser *htmlParser) tagNodeToEntity(node *html.Node, stripLinebreak bool) case "pre": return parser.codeblockToEntity(node) default: - return &messages.HTMLEntity{ + return &messages.BaseHTMLEntity{ Tag: node.Data, Children: parser.nodeToEntities(node.FirstChild, stripLinebreak), Block: parser.isBlockTag(node.Data), @@ -342,13 +307,13 @@ func (parser *htmlParser) tagNodeToEntity(node *html.Node, stripLinebreak bool) } } -func (parser *htmlParser) singleNodeToEntity(node *html.Node, stripLinebreak bool) *messages.HTMLEntity { +func (parser *htmlParser) singleNodeToEntity(node *html.Node, stripLinebreak bool) messages.HTMLEntity { switch node.Type { case html.TextNode: if stripLinebreak { node.Data = strings.Replace(node.Data, "\n", "", -1) } - return &messages.HTMLEntity{ + return &messages.BaseHTMLEntity{ Tag: "text", Text: node.Data, } @@ -358,7 +323,7 @@ func (parser *htmlParser) singleNodeToEntity(node *html.Node, stripLinebreak boo if node.FirstChild.Data == "html" && node.FirstChild.NextSibling == nil { return parser.singleNodeToEntity(node.FirstChild, stripLinebreak) } - return &messages.HTMLEntity{ + return &messages.BaseHTMLEntity{ Tag: "html", Children: parser.nodeToEntities(node.FirstChild, stripLinebreak), Block: true, @@ -368,7 +333,7 @@ func (parser *htmlParser) singleNodeToEntity(node *html.Node, stripLinebreak boo } } -func (parser *htmlParser) nodeToEntities(node *html.Node, stripLinebreak bool) (entities []*messages.HTMLEntity) { +func (parser *htmlParser) nodeToEntities(node *html.Node, stripLinebreak bool) (entities []messages.HTMLEntity) { for ; node != nil; node = node.NextSibling { if entity := parser.singleNodeToEntity(node, stripLinebreak); entity != nil { entities = append(entities, entity) @@ -377,7 +342,7 @@ func (parser *htmlParser) nodeToEntities(node *html.Node, stripLinebreak bool) ( return } -var BlockTags = []string{"p", "h1", "h2", "h3", "h4", "h5", "h6", "ol", "ul", "pre", "blockquote", "div", "hr", "table"} +var BlockTags = []string{"p", "h1", "h2", "h3", "h4", "h5", "h6", "ol", "ul", "li", "pre", "blockquote", "div", "hr", "table"} func (parser *htmlParser) isBlockTag(tag string) bool { for _, blockTag := range BlockTags { @@ -388,27 +353,27 @@ func (parser *htmlParser) isBlockTag(tag string) bool { return false } -func (parser *htmlParser) Parse(htmlData string) *messages.HTMLEntity { +func (parser *htmlParser) Parse(htmlData string) messages.HTMLEntity { node, _ := html.Parse(strings.NewReader(htmlData)) return parser.singleNodeToEntity(node, true) } // ParseHTMLMessage parses a HTML-formatted Matrix event into a UIMessage. -func ParseHTMLMessage(room *rooms.Room, evt *mautrix.Event, senderDisplayname string) *messages.HTMLEntity { +func ParseHTMLMessage(room *rooms.Room, evt *mautrix.Event, senderDisplayname string) messages.HTMLEntity { htmlData := evt.Content.FormattedBody htmlData = strings.Replace(htmlData, "\t", " ", -1) parser := htmlParser{room} root := parser.Parse(htmlData) - root.Block = false + root.(*messages.BaseHTMLEntity).Block = false if evt.Content.MsgType == mautrix.MsgEmote { - root = &messages.HTMLEntity{ + root = &messages.BaseHTMLEntity{ Tag: "emote", - Children: []*messages.HTMLEntity{ - {Text: "* "}, - {Text: senderDisplayname, Style: tcell.StyleDefault.Foreground(widget.GetHashColor(evt.Sender))}, - {Text: " "}, + Children: []messages.HTMLEntity{ + messages.NewHTMLTextEntity("* "), + messages.NewHTMLTextEntity("* ").AdjustStyle(AdjustStyleTextColor(widget.GetHashColor(evt.Sender))), + messages.NewHTMLTextEntity(" "), root, }, } -- cgit v1.2.3 From 5d7c1a4caab46f7e981aed7b9cc825b7602b4098 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 7 Apr 2019 22:54:55 +0300 Subject: Improve handling of multiple linebreaks --- ui/messages/parser/htmlparser.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/messages/parser/htmlparser.go') diff --git a/ui/messages/parser/htmlparser.go b/ui/messages/parser/htmlparser.go index 464459e..e658c61 100644 --- a/ui/messages/parser/htmlparser.go +++ b/ui/messages/parser/htmlparser.go @@ -289,7 +289,7 @@ func (parser *htmlParser) tagNodeToEntity(node *html.Node, stripLinebreak bool) case "h1", "h2", "h3", "h4", "h5", "h6": return parser.headerToEntity(node, stripLinebreak) case "br": - return &messages.BaseHTMLEntity{Tag: "br", Block: true} + return messages.NewBreakEntity() case "b", "strong", "i", "em", "s", "del", "u", "ins", "font": return parser.basicFormatToEntity(node, stripLinebreak) case "a": -- cgit v1.2.3