Merge pull request #448 from noborus/improve-candidate

Changed via method
noborus · Oct 2, 2023 · 3fb7dba · 3fb7dba
2 parents 23db449 + a541e45
commit 3fb7dba
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 29 deletions.
diff --git a/oviewer/input.go b/oviewer/input.go
@@ -267,6 +267,21 @@ type candidate struct {
 	p    int
 }
 
+func (c *candidate) toLast(str string) {
+	c.list = toLast(c.list, str)
+	c.p = 0
+}
+
+func (c *candidate) toAddTop(str string) {
+	c.list = toAddTop(c.list, str)
+	c.p = 0
+}
+
+func (c *candidate) toAddLast(str string) {
+	c.list = toAddLast(c.list, str)
+	c.p = 0
+}
+
 // up returns the previous candidate.
 func (c *candidate) up() string {
 	if len(c.list) == 0 {

diff --git a/oviewer/input_delimiter.go b/oviewer/input_delimiter.go
@@ -48,8 +48,7 @@ func (e *eventDelimiter) Prompt() string {
 // Confirm returns the event when the input is confirmed.
 func (e *eventDelimiter) Confirm(str string) tcell.Event {
 	e.value = str
-	e.clist.list = toLast(e.clist.list, str)
-	e.clist.p = 0
+	e.clist.toLast(str)
 	e.SetEventNow()
 	return e
 }

diff --git a/oviewer/input_goto.go b/oviewer/input_goto.go
@@ -42,8 +42,7 @@ func (e *eventGoto) Prompt() string {
 // Confirm returns the event when the input is confirmed.
 func (e *eventGoto) Confirm(str string) tcell.Event {
 	e.value = str
-	e.clist.list = toLast(e.clist.list, str)
-	e.clist.p = 0
+	e.clist.toLast(str)
 	e.SetEventNow()
 	return e
 }

diff --git a/oviewer/input_jumptarget.go b/oviewer/input_jumptarget.go
@@ -44,8 +44,7 @@ func (e *eventJumpTarget) Prompt() string {
 // Confirm returns the event when the input is confirmed.
 func (e *eventJumpTarget) Confirm(str string) tcell.Event {
 	e.value = str
-	e.clist.list = toLast(e.clist.list, str)
-	e.clist.p = 0
+	e.clist.toLast(str)
 	e.SetEventNow()
 	return e
 }

diff --git a/oviewer/input_multicolor.go b/oviewer/input_multicolor.go
@@ -17,7 +17,7 @@ func (root *Root) setMultiColorMode() {
 
 	list := root.searchCandidates(searchCandidateListLen)
 	str := strings.Join(list, " ")
-	input.MultiColorCandidate.list = toLast(input.MultiColorCandidate.list, str)
+	input.MultiColorCandidate.toLast(str)
 
 	input.Event = newMultiColorEvent(input.MultiColorCandidate)
 }
@@ -57,20 +57,19 @@ func (e *eventMultiColor) Prompt() string {
 // Confirm returns the event when the input is confirmed.
 func (e *eventMultiColor) Confirm(str string) tcell.Event {
 	e.value = str
-	e.clist.list = toLast(e.clist.list, str)
-	e.clist.p = 0
+	e.clist.toLast(str)
 	e.SetEventNow()
 	return e
 }
 
 // Up returns strings when the up key is pressed during input.
 func (e *eventMultiColor) Up(str string) string {
-	e.clist.list = toAddLast(e.clist.list, str)
+	e.clist.toAddLast(str)
 	return e.clist.up()
 }
 
 // Down returns strings when the down key is pressed during input.
 func (e *eventMultiColor) Down(str string) string {
-	e.clist.list = toAddTop(e.clist.list, str)
+	e.clist.toAddTop(str)
 	return e.clist.down()
 }
diff --git a/oviewer/input_search.go b/oviewer/input_search.go
@@ -47,21 +47,20 @@ func (e *eventInputSearch) Prompt() string {
 // Confirm returns the event when the input is confirmed.
 func (e *eventInputSearch) Confirm(str string) tcell.Event {
 	e.value = str
-	e.clist.list = toLast(e.clist.list, str)
-	e.clist.p = 0
+	e.clist.toLast(str)
 	e.SetEventNow()
 	return e
 }
 
 // Up returns strings when the up key is pressed during input.
 func (e *eventInputSearch) Up(str string) string {
-	e.clist.list = toAddLast(e.clist.list, str)
+	e.clist.toAddLast(str)
 	return e.clist.up()
 }
 
 // Down returns strings when the down key is pressed during input.
 func (e *eventInputSearch) Down(str string) string {
-	e.clist.list = toAddTop(e.clist.list, str)
+	e.clist.toAddTop(str)
 	return e.clist.down()
 }
 
@@ -98,21 +97,20 @@ func (e *eventInputBackSearch) Prompt() string {
 // Confirm returns the event when the input is confirmed.
 func (e *eventInputBackSearch) Confirm(str string) tcell.Event {
 	e.value = str
-	e.clist.list = toLast(e.clist.list, str)
-	e.clist.p = 0
+	e.clist.toLast(str)
 	e.SetEventNow()
 	return e
 }
 
 // Up returns strings when the up key is pressed during input.
 func (e *eventInputBackSearch) Up(str string) string {
-	e.clist.list = toAddLast(e.clist.list, str)
+	e.clist.toAddLast(str)
 	return e.clist.up()
 }
 
 // Down returns strings when the down key is pressed during input.
 func (e *eventInputBackSearch) Down(str string) string {
-	e.clist.list = toAddTop(e.clist.list, str)
+	e.clist.toAddTop(str)
 	return e.clist.down()
 }
 

diff --git a/oviewer/input_section_delimiter.go b/oviewer/input_section_delimiter.go
@@ -48,8 +48,7 @@ func (e *eventSectionDelimiter) Prompt() string {
 // Confirm returns the event when the input is confirmed.
 func (e *eventSectionDelimiter) Confirm(str string) tcell.Event {
 	e.value = str
-	e.clist.list = toLast(e.clist.list, str)
-	e.clist.p = 0
+	e.clist.toLast(str)
 	e.SetEventNow()
 	return e
 }

diff --git a/oviewer/input_section_start.go b/oviewer/input_section_start.go
@@ -46,8 +46,7 @@ func (e *eventSectionStart) Prompt() string {
 // Confirm returns the event when the input is confirmed.
 func (e *eventSectionStart) Confirm(str string) tcell.Event {
 	e.value = str
-	e.clist.list = toLast(e.clist.list, str)
-	e.clist.p = 0
+	e.clist.toLast(str)
 	e.SetEventNow()
 	return e
 }

diff --git a/oviewer/input_tabwidth.go b/oviewer/input_tabwidth.go
@@ -48,8 +48,7 @@ func (e *eventTabWidth) Prompt() string {
 // Confirm returns the event when the input is confirmed.
 func (e *eventTabWidth) Confirm(str string) tcell.Event {
 	e.value = str
-	e.clist.list = toLast(e.clist.list, str)
-	e.clist.p = 0
+	e.clist.toLast(str)
 	e.SetEventNow()
 	return e
 }

diff --git a/oviewer/input_watch.go b/oviewer/input_watch.go
@@ -46,8 +46,7 @@ func (e *eventWatchInterval) Prompt() string {
 // Confirm returns the event when the input is confirmed.
 func (e *eventWatchInterval) Confirm(str string) tcell.Event {
 	e.value = str
-	e.clist.list = toLast(e.clist.list, str)
-	e.clist.p = 0
+	e.clist.toLast(str)
 	e.SetEventNow()
 	return e
 }

diff --git a/oviewer/input_writeba.go b/oviewer/input_writeba.go
@@ -42,8 +42,7 @@ func (e *eventWriteBA) Prompt() string {
 // Confirm returns the event when the input is confirmed.
 func (e *eventWriteBA) Confirm(str string) tcell.Event {
 	e.value = str
-	e.clist.list = toLast(e.clist.list, str)
-	e.clist.p = 0
+	e.clist.toLast(str)
 	e.SetEventNow()
 	return e
 }