Fixed candidate movement when up/down

Fixed an issue where candidate movement was being reset
when going up/down.

Some inputs have been changed so
that the current value is always added to the candidates.
The values specified by CLI options, etc.,
were not retained in the history.

oviewer/input.go

@@ -2,6 +2,7 @@ package oviewer
 
 import (
 	"context"
+	"sync"
 
 	"github.com/gdamore/tcell/v2"
 	"github.com/mattn/go-runewidth"
@@ -263,27 +264,37 @@ type Eventer interface {
 
 // candidate represents a input candidate list.
 type candidate struct {
+	mux  sync.Mutex
 	list []string
 	p    int
 }
 
 func (c *candidate) toLast(str string) {
+	if str == "" {
+		return
+	}
+	c.mux.Lock()
+	defer c.mux.Unlock()
 	c.list = toLast(c.list, str)
 	c.p = 0
 }
 
 func (c *candidate) toAddTop(str string) {
+	c.mux.Lock()
+	defer c.mux.Unlock()
 	c.list = toAddTop(c.list, str)
-	c.p = 0
 }
 
 func (c *candidate) toAddLast(str string) {
+	c.mux.Lock()
+	defer c.mux.Unlock()
 	c.list = toAddLast(c.list, str)
-	c.p = 0
 }
 
 // up returns the previous candidate.
 func (c *candidate) up() string {
+	c.mux.Lock()
+	defer c.mux.Unlock()
 	if len(c.list) == 0 {
 		return ""
 	}
@@ -299,6 +310,8 @@ func (c *candidate) up() string {
 
 // down returns the next candidate.
 func (c *candidate) down() string {
+	c.mux.Lock()
+	defer c.mux.Unlock()
 	if len(c.list) == 0 {
 		return ""
 	}

oviewer/input_delimiter.go

@@ -1,12 +1,17 @@
 package oviewer
 
-import "github.com/gdamore/tcell/v2"
+import (
+	"github.com/gdamore/tcell/v2"
+)
 
 // setDelimiterMode sets the inputMode to Delimiter.
 func (root *Root) setDelimiterMode() {
 	input := root.input
 	input.value = ""
 	input.cursorX = 0
+
+	input.DelimiterCandidate.toLast(root.Doc.ColumnDelimiter)
+
 	input.Event = newDelimiterEvent(input.DelimiterCandidate)
 }
 

oviewer/input_jumptarget.go

@@ -1,12 +1,17 @@
 package oviewer
 
-import "github.com/gdamore/tcell/v2"
+import (
+	"github.com/gdamore/tcell/v2"
+)
 
 // setJumpTargetMode sets the inputMode to JumpTarget.
 func (root *Root) setJumpTargetMode() {
 	input := root.input
 	input.value = ""
 	input.cursorX = 0
+
+	input.JumpTargetCandidate.toLast(root.Doc.JumpTarget)
+
 	input.Event = newJumpTargetEvent(input.JumpTargetCandidate)
 }
 

oviewer/input_multicolor.go

@@ -15,6 +15,8 @@ func (root *Root) setMultiColorMode() {
 	input.value = ""
 	input.cursorX = 0
 
+	old := root.Doc.MultiColorWords
+	input.MultiColorCandidate.toLast(strings.Join(old, " "))
 	list := root.searchCandidates(searchCandidateListLen)
 	str := strings.Join(list, " ")
 	input.MultiColorCandidate.toLast(str)

oviewer/input_search.go

@@ -1,12 +1,19 @@
 package oviewer
 
-import "github.com/gdamore/tcell/v2"
+import (
+	"github.com/gdamore/tcell/v2"
+)
 
 // setSearchMode sets the inputMode to Search.
 func (root *Root) setSearchMode() {
 	input := root.input
 	input.value = ""
 	input.cursorX = 0
+
+	if root.searcher != nil {
+		input.SearchCandidate.toLast(root.searcher.String())
+	}
+
 	input.Event = newSearchEvent(input.SearchCandidate)
 	root.OriginPos = root.Doc.topLN
 }
@@ -69,6 +76,11 @@ func (root *Root) setBackSearchMode() {
 	input := root.input
 	input.value = ""
 	input.cursorX = 0
+
+	if root.searcher != nil {
+		input.SearchCandidate.toLast(root.searcher.String())
+	}
+
 	input.Event = newBackSearchEvent(input.SearchCandidate)
 	root.OriginPos = root.Doc.topLN
 }
@@ -116,6 +128,9 @@ func (e *eventInputBackSearch) Down(str string) string {
 
 // searchCandidates returns the list of search candidates.
 func (root *Root) searchCandidates(n int) []string {
+	root.input.SearchCandidate.mux.Lock()
+	defer root.input.SearchCandidate.mux.Unlock()
+
 	listLen := len(root.input.SearchCandidate.list)
 	start := max(0, listLen-n)
 	return root.input.SearchCandidate.list[start:listLen]

oviewer/input_section_delimiter.go

@@ -7,6 +7,9 @@ func (root *Root) setSectionDelimiterMode() {
 	input := root.input
 	input.value = ""
 	input.cursorX = 0
+
+	input.SectionDelmCandidate.toLast(root.Doc.SectionDelimiter)
+
 	input.Event = newSectionDelimiterEvent(input.SectionDelmCandidate)
 }
 

oviewer/input_tabwidth.go

@@ -1,13 +1,19 @@
 package oviewer
 
-import "github.com/gdamore/tcell/v2"
+import (
+	"strconv"
+
+	"github.com/gdamore/tcell/v2"
+)
 
 // setTabWidthMode sets the inputMode to TabWidth.
 func (root *Root) setTabWidthMode() {
 	input := root.input
 	input.value = ""
 	input.cursorX = 0
 
+	input.TabWidthCandidate.toLast(strconv.Itoa(root.Doc.TabWidth))
+
 	input.Event = newTabWidthEvent(input.TabWidthCandidate)
 }