fix raw mode

pressing enter in raw mode did still execute history entry from normal mode very dangerous, very embarassing
curusarn · May 17, 2020 · ec302f5 · ec302f5
1 parent fe878c5
commit ec302f5
Showing 1 changed file with 24 additions and 8 deletions.
diff --git a/cmd/cli/main.go b/cmd/cli/main.go
@@ -200,21 +200,37 @@ type manager struct {
 func (m manager) SelectExecute(g *gocui.Gui, v *gocui.View) error {
 	m.s.lock.Lock()
 	defer m.s.lock.Unlock()
-	if m.s.highlightedItem < len(m.s.data) {
-		m.s.output = m.s.data[m.s.highlightedItem].CmdLine
-		m.s.exitCode = exitCodeExecute
-		return gocui.ErrQuit
+	if m.s.rawMode {
+		if m.s.highlightedItem < len(m.s.rawData) {
+			m.s.output = m.s.rawData[m.s.highlightedItem].CmdLine
+			m.s.exitCode = exitCodeExecute
+			return gocui.ErrQuit
+		}
+	} else {
+		if m.s.highlightedItem < len(m.s.data) {
+			m.s.output = m.s.data[m.s.highlightedItem].CmdLine
+			m.s.exitCode = exitCodeExecute
+			return gocui.ErrQuit
+		}
 	}
 	return nil
 }
 
 func (m manager) SelectPaste(g *gocui.Gui, v *gocui.View) error {
 	m.s.lock.Lock()
 	defer m.s.lock.Unlock()
-	if m.s.highlightedItem < len(m.s.data) {
-		m.s.output = m.s.data[m.s.highlightedItem].CmdLine
-		m.s.exitCode = 0 // success
-		return gocui.ErrQuit
+	if m.s.rawMode {
+		if m.s.highlightedItem < len(m.s.rawData) {
+			m.s.output = m.s.rawData[m.s.highlightedItem].CmdLine
+			m.s.exitCode = 0 // success
+			return gocui.ErrQuit
+		}
+	} else {
+		if m.s.highlightedItem < len(m.s.data) {
+			m.s.output = m.s.data[m.s.highlightedItem].CmdLine
+			m.s.exitCode = 0 // success
+			return gocui.ErrQuit
+		}
 	}
 	return nil
 }