CHANGELOG.md

@@ -163,7 +163,6 @@ will result in the files being completed.
 - Fix completion search menu disappearing
 - Completion paths having duplicated characters if it's escaped
 - Get custom completion command properly to call from Lua
-- Put proper command on the line when using up and down arrow keys to go through command history
 
 ## [2.0.0-rc1] - 2022-09-14
 This is a pre-release version of Hilbish for testing. To see the changelog,

README.md

@@ -70,7 +70,6 @@ If you're new to nix you should probably read up on how to do that [here](https:
 ### Prerequisites
 - [Go 1.17+](https://go.dev)
 - [Task](https://taskfile.dev/#/)
-	- **Do go to the link here for the installation of Task. Too much people install taskwarrior, which is the wrong program**
 
 ### Build
 First, clone Hilbish. The recursive is required, as some Lua libraries

readline/history.go

@@ -123,20 +123,23 @@ func (rl *Instance) walkHistory(i int) {
 
 	// When we are exiting the current line buffer to move around
 	// the history, we make buffer the current line
-	if rl.histOffset == 0 && rl.histOffset + i == 1 {
+	if rl.histPos == 0 && (rl.histPos+i) == 1 {
 		rl.lineBuf = string(rl.line)
 	}
 
-	rl.histOffset += i
-	if rl.histOffset == 0 {
+	switch rl.histPos + i {
+	case 0, history.Len() + 1:
+		rl.histPos = 0
 		rl.line = []rune(rl.lineBuf)
 		rl.pos = len(rl.lineBuf)
-	} else if rl.histOffset <= -1 {
-		rl.histOffset = 0
-	} else {
+		return
+	case -1:
+		rl.histPos = 0
+		rl.lineBuf = string(rl.line)
+	default:
 		dedup = true
 		old = string(rl.line)
-		new, err = history.GetLine(history.Len() - rl.histOffset)
+		new, err = history.GetLine(history.Len() - rl.histPos - 1)
 		if err != nil {
 			rl.resetHelpers()
 			print("\r\n" + err.Error() + "\r\n")
@@ -145,6 +148,7 @@ func (rl *Instance) walkHistory(i int) {
 		}
 
 		rl.clearLine()
+		rl.histPos += i
 		rl.line = []rune(new)
 		rl.pos = len(rl.line)
 		if rl.pos > 0 {

readline/instance.go

@@ -134,7 +134,6 @@ type Instance struct {
 	// history operating params
 	lineBuf    string
 	histPos    int
-	histOffset int
 	histNavIdx int // Used for quick history navigation.
 
 	//

readline/readline.go

@@ -49,7 +49,7 @@ func (rl *Instance) Readline() (string, error) {
 
 	// History Init
 	// We need this set to the last command, so that we can access it quickly
-	rl.histOffset = 0
+	rl.histPos = 0
 	rl.viUndoHistory = []undoItem{{line: "", pos: 0}}
 
 	// Multisplit