From d383788859eac52a73b0bf98faf97a34f1bb5e63 Mon Sep 17 00:00:00 2001
From: Jayson Wang <jayson@laboys.org>
Date: Sun, 28 May 2023 21:02:17 +0800
Subject: [PATCH] Fix the wrong/redundant icon in the prompt bar (#2105)

---
 internal/model/cmd_buff.go | 28 ++++++++--------------------
 internal/ui/prompt.go      |  1 +
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/internal/model/cmd_buff.go b/internal/model/cmd_buff.go
index 2a35947b..ba4db4b3 100644
--- a/internal/model/cmd_buff.go
+++ b/internal/model/cmd_buff.go
@@ -38,7 +38,7 @@ type (
 type CmdBuff struct {
 	buff       []rune
 	suggestion string
-	listeners  []BuffWatcher
+	listeners  map[BuffWatcher]struct{}
 	hotKey     rune
 	kind       BufferKind
 	active     bool
@@ -52,7 +52,7 @@ func NewCmdBuff(key rune, kind BufferKind) *CmdBuff {
 		hotKey:    key,
 		kind:      kind,
 		buff:      make([]rune, 0, maxBuff),
-		listeners: []BuffWatcher{},
+		listeners: make(map[BuffWatcher]struct{}),
 	}
 }
 
@@ -221,7 +221,7 @@ func (c *CmdBuff) Empty() bool {
 func (c *CmdBuff) AddListener(w BuffWatcher) {
 	c.mx.Lock()
 	{
-		c.listeners = append(c.listeners, w)
+		c.listeners[w] = struct{}{}
 	}
 	c.mx.Unlock()
 }
@@ -229,36 +229,24 @@ func (c *CmdBuff) AddListener(w BuffWatcher) {
 // RemoveListener removes a listener.
 func (c *CmdBuff) RemoveListener(l BuffWatcher) {
 	c.mx.Lock()
-	defer c.mx.Unlock()
-
-	victim := -1
-	for i, lis := range c.listeners {
-		if l == lis {
-			victim = i
-			break
-		}
-	}
-	if victim == -1 {
-		return
-	}
-
-	c.listeners = append(c.listeners[:victim], c.listeners[victim+1:]...)
+	delete(c.listeners, l)
+	c.mx.Unlock()
 }
 
 func (c *CmdBuff) fireBufferCompleted(t, s string) {
-	for _, l := range c.listeners {
+	for l := range c.listeners {
 		l.BufferCompleted(t, s)
 	}
 }
 
 func (c *CmdBuff) fireBufferChanged(t, s string) {
-	for _, l := range c.listeners {
+	for l := range c.listeners {
 		l.BufferChanged(t, s)
 	}
 }
 
 func (c *CmdBuff) fireActive(b bool) {
-	for _, l := range c.listeners {
+	for l := range c.listeners {
 		l.BufferActive(b, c.GetKind())
 	}
 }
diff --git a/internal/ui/prompt.go b/internal/ui/prompt.go
index 4283793c..dedbdfeb 100644
--- a/internal/ui/prompt.go
+++ b/internal/ui/prompt.go
@@ -182,6 +182,7 @@ func (p *Prompt) InCmdMode() bool {
 }
 
 func (p *Prompt) activate() {
+	p.Clear()
 	p.SetCursorIndex(len(p.model.GetText()))
 	p.write(p.model.GetText(), p.model.GetSuggestion())
 	p.model.Notify(false)