Skip to content

Commit

Permalink
fix: revert "fix: multiline cursor redraw"
Browse files Browse the repository at this point in the history
This reverts commit 1339dc4.
this caused a few issues, including
history search messing up previous lines
what this commit was trying to fix is unimportant anyway
  • Loading branch information
TorchedSammy committed May 29, 2022
1 parent 1339dc4 commit f9a2a98
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
1 change: 0 additions & 1 deletion readline/line.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ func (rl *Instance) echo() {
print(seqClearScreenBelow)

// Print the prompt
rl.promptInPlace("")
print(string(rl.realPrompt))

// Assemble the line, taking virtual completions into account
Expand Down
14 changes: 8 additions & 6 deletions readline/prompt.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ func (rl *Instance) RefreshPromptLog(log string) (err error) {
return
}

func (rl *Instance) promptInPlace(prompt string) {
// RefreshPromptInPlace - Refreshes the prompt in the very same place he is.
func (rl *Instance) RefreshPromptInPlace(prompt string) (err error) {
// We adjust cursor movement, depending on which mode we're currently in.
// Prompt data intependent
if !rl.modeTabCompletion {
Expand All @@ -90,11 +91,15 @@ func (rl *Instance) promptInPlace(prompt string) {
rl.SetPrompt(prompt)
}

if rl.Multiline {
rl.tcUsedY += 1
}

// Clear the input line and everything below
print(seqClearLine)
moveCursorUp(rl.infoY + rl.tcUsedY)
moveCursorBackwards(GetTermWidth())
print("\r" + seqClearScreenBelow)
print("\r\n" + seqClearScreenBelow)

// Add a new line if needed
if rl.Multiline {
Expand All @@ -103,11 +108,8 @@ func (rl *Instance) promptInPlace(prompt string) {
} else {
fmt.Print(rl.mainPrompt)
}
}

// RefreshPromptInPlace - Refreshes the prompt in the very same place he is.
func (rl *Instance) RefreshPromptInPlace(prompt string) (err error) {
rl.promptInPlace(prompt)
// Refresh the line
rl.updateHelpers()

return
Expand Down

0 comments on commit f9a2a98

Please sign in to comment.