Merge pull request #387 from n-peugnet/mangled-lines

Fix mangled newlines in some code blocks

ui/messages/html/parser.go

@@ -305,27 +305,21 @@ func (parser *htmlParser) syntaxHighlight(text, language string) Entity {
 
  var children []Entity
  for _, token := range tokens {
- if token.Value == "\n" {
- children = append(children, NewBreakEntity())
-
- } else if token.Type.String() == "CommentSingle" {
- children = append(children, tokenToTextEntity(style, &token))
- children = append(children, NewBreakEntity())
+ lines := strings.SplitAfter(token.Value, "\n")
+ for _, line := range lines {
+ line_len := len(line)
+ if line_len == 0 {
+ continue
+ }
+ t := token.Clone()
 
- } else if token.Type.String() == "CommentMultiline" {
- lines := strings.Split(token.Value, "\n")
- for i, line := range lines {
-  t := token.Clone()
+  if line[line_len-1:] == "\n" {
+  t.Value = line[:line_len-1]
+  children = append(children, tokenToTextEntity(style, &t), NewBreakEntity())
+ } else {
  t.Value = line
  children = append(children, tokenToTextEntity(style, &t))
-
- if i < len(lines)-1 {
- children = append(children, NewBreakEntity())
- }
  }
-
- } else {
- children = append(children, tokenToTextEntity(style, &token))
  }
  }