Fixed multicolor's candidates

Fixed that multicolor candidates did not have the latest history.
noborus · Oct 10, 2023 · c298e7c · c298e7c
1 parent f74d6d3
commit c298e7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/oviewer/document.go b/oviewer/document.go
@@ -466,6 +466,7 @@ func (m *Document) setSectionDelimiter(delm string) {
 
 // setMultiColorWords set multiple strings to highlight with multiple colors.
 func (m *Document) setMultiColorWords(words []string) {
+	m.MultiColorWords = words
 	m.multiColorRegexps = multiRegexpCompile(words)
 }
 

diff --git a/oviewer/input_multicolor.go b/oviewer/input_multicolor.go
@@ -15,12 +15,10 @@ func (root *Root) setMultiColorMode() {
 	input.value = ""
 	input.cursorX = 0
 
+	searches := root.searchCandidates(searchCandidateListLen)
+	input.MultiColorCandidate.toLast(strings.Join(searches, " "))
 	old := root.Doc.MultiColorWords
 	input.MultiColorCandidate.toLast(strings.Join(old, " "))
-	list := root.searchCandidates(searchCandidateListLen)
-	str := strings.Join(list, " ")
-	input.MultiColorCandidate.toLast(str)
-
 	input.Event = newMultiColorEvent(input.MultiColorCandidate)
 }