Merge pull request #231 from noborus/move-multicolor

Moved multicolor settings from viewer to document

oviewer/action.go

@@ -436,25 +436,10 @@ func (root *Root) setMultiColor(input string) {
 		return !quoted && r == ' '
 	})
 
-	root.setMultiColorWords(f)
+	root.Doc.setMultiColorWords(f)
 	root.setMessagef("Set multicolor strings [%s]", input)
 }
 
-// setMultiColor set multiple strings to highlight with multiple colors.
-func (root *Root) setMultiColorWords(words []string) {
-	m := root.Doc
-
-	m.multiColorRegexps = nil
-	for _, w := range words {
-		s, err := strconv.Unquote(w)
-		if err != nil {
-			s = w
-		}
-		reg := regexpCompile(s, true)
-		m.multiColorRegexps = append(m.multiColorRegexps, reg)
-	}
-}
-
 // setJumpTarget sets the position of the search result.
 func (root *Root) setJumpTarget(input string) {
 	num := int(math.Round(strToPosition(root.vHight, input)))

oviewer/document.go

@@ -7,6 +7,7 @@ import (
 	"io/fs"
 	"os"
 	"regexp"
+	"strconv"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -332,3 +333,16 @@ func (m *Document) setSectionDelimiter(delm string) {
 	m.SectionDelimiter = delm
 	m.SectionDelimiterReg = regexpCompile(delm, true)
 }
+
+// setMultiColor set multiple strings to highlight with multiple colors.
+func (m *Document) setMultiColorWords(words []string) {
+	m.multiColorRegexps = nil
+	for _, w := range words {
+		s, err := strconv.Unquote(w)
+		if err != nil {
+			s = w
+		}
+		reg := regexpCompile(s, true)
+		m.multiColorRegexps = append(m.multiColorRegexps, reg)
+	}
+}

oviewer/oviewer.go

@@ -557,16 +557,17 @@ func (root *Root) Run() error {
 		root.Screen.EnableMouse(MouseFlags)
 	}
 
-	if root.Config.MultiColorWords != nil {
-		root.setMultiColorWords(root.Config.MultiColorWords)
-	}
-
 	root.Config.General.SectionDelimiterReg = regexpCompile(root.Config.General.SectionDelimiter, true)
 
 	root.optimizedMan()
 
 	for n, doc := range root.DocList {
 		doc.general = root.Config.General
+
+		if root.Config.MultiColorWords != nil {
+			doc.setMultiColorWords(root.Config.MultiColorWords)
+		}
+
 		w := ""
 		if doc.general.WatchInterval > 0 {
 			doc.watchMode()