Fix alt-left alt-right navigation

document.go

@@ -6,7 +6,6 @@ import (
 
  "github.com/elk-language/go-prompt/internal/bisect"
  istrings "github.com/elk-language/go-prompt/internal/strings"
- runewidth "github.com/mattn/go-runewidth"
  "golang.org/x/exp/utf8string"
 )
 
@@ -133,11 +132,11 @@ func (d *Document) FindStartOfPreviousWord() istrings.ByteIndex {
  return 0
 }
 
-// Returns the string width (as visible in the terminal)
+// Returns the rune count
 // of the text before the cursor until the start of the previous word.
-func (d *Document) FindStringWidthUntilStartOfPreviousWord() int {
+func (d *Document) FindRuneCountUntilStartOfPreviousWord() istrings.RuneCount {
  x := d.TextBeforeCursor()
- return runewidth.StringWidth(x[d.FindStartOfPreviousWordWithSpace():])
+ return istrings.RuneLen(x[d.FindStartOfPreviousWordWithSpace():])
 }
 
 // FindStartOfPreviousWordWithSpace is almost the same as FindStartOfPreviousWord.
@@ -219,15 +218,15 @@ func (d *Document) FindEndOfCurrentWordWithSpace() istrings.ByteIndex {
  return start + end
 }
 
-// Returns the string width (as visible in the terminal)
+// Returns the number of runes
 // of the text after the cursor until the end of the current word.
-func (d *Document) FindStringWidthUntilEndOfCurrentWord() istrings.StringWidth {
+func (d *Document) FindRuneCountUntilEndOfCurrentWord() istrings.RuneCount {
  t := d.TextAfterCursor()
- var width istrings.StringWidth
+ var count istrings.RuneCount
  nonSpaceCharSeen := false
  for _, char := range t {
  if !nonSpaceCharSeen && char == ' ' {
- width += 1
+ count += 1
  continue
  }
 
@@ -236,10 +235,10 @@ func (d *Document) FindStringWidthUntilEndOfCurrentWord() istrings.StringWidth {
  }
 
  nonSpaceCharSeen = true
- width += istrings.StringWidth(runewidth.RuneWidth(char))
+ count += 1
  }
 
- return width
+ return count
 }
 
 // FindEndOfCurrentWordUntilSeparator is almost the same as FindEndOfCurrentWord.

emacs.go

@@ -101,7 +101,7 @@ var emacsKeyBindings = []KeyBind{
  {
  Key: AltRight,
  Fn: func(buf *Buffer) {
- buf.CursorRight(istrings.RuneIndex(buf.Document().FindStringWidthUntilEndOfCurrentWord())) // WARN
+ buf.CursorRight(buf.Document().FindRuneCountUntilEndOfCurrentWord())
  },
  },
  // Left allow: Backward one character
@@ -115,20 +115,20 @@ var emacsKeyBindings = []KeyBind{
  {
  Key: AltLeft,
  Fn: func(buf *Buffer) {
- buf.CursorLeft(istrings.RuneIndex(buf.Document().FindStringWidthUntilStartOfPreviousWord())) // WARN
+ buf.CursorLeft(buf.Document().FindRuneCountUntilStartOfPreviousWord())
  },
  },
  // Cut the Word before the cursor.
  {
  Key: ControlW,
  Fn: func(buf *Buffer) {
- buf.DeleteBeforeCursor(istrings.RuneIndex(len([]rune(buf.Document().GetWordBeforeCursorWithSpace()))))
+ buf.DeleteBeforeCursor(istrings.RuneLen(buf.Document().GetWordBeforeCursorWithSpace()))
  },
  },
  {
  Key: AltBackspace,
  Fn: func(buf *Buffer) {
- buf.DeleteBeforeCursor(istrings.RuneIndex(len([]rune(buf.Document().GetWordBeforeCursorWithSpace()))))
+ buf.DeleteBeforeCursor(istrings.RuneLen(buf.Document().GetWordBeforeCursorWithSpace()))
  },
  },
  // Clear the Screen, similar to the clear command

key_bind_func.go

@@ -21,11 +21,6 @@ func DeleteChar(buf *Buffer) {
  buf.Delete(1)
 }
 
-// DeleteWord Delete word before the cursor
-func DeleteWord(buf *Buffer) {
- buf.DeleteBeforeCursor(istrings.RuneCount(len([]rune(buf.Document().TextBeforeCursor()))) - istrings.RuneCount(buf.Document().FindStartOfPreviousWordWithSpace())) // WARN
-}
-
 // DeleteBeforeChar Go to Backspace
 func DeleteBeforeChar(buf *Buffer) {
  buf.DeleteBeforeCursor(1)
@@ -40,13 +35,3 @@ func GoRightChar(buf *Buffer) {
 func GoLeftChar(buf *Buffer) {
  buf.CursorLeft(1)
 }
-
-// GoRightWord Forward one word
-func GoRightWord(buf *Buffer) {
- buf.CursorRight(istrings.RuneCount(buf.Document().FindEndOfCurrentWordWithSpace())) // WARN
-}
-
-// GoLeftWord Backward one word
-func GoLeftWord(buf *Buffer) {
- buf.CursorLeft(istrings.RuneCount(len([]rune(buf.Document().TextBeforeCursor()))) - istrings.RuneCount(buf.Document().FindStartOfPreviousWordWithSpace())) // WARN
-}