Skip to content

GitLab

Unverified Commit 9446c2c9 authored by Michael Yang's avatar Michael Yang Committed by GitHub
Browse files

Merge pull request #8196 from ollama/mxyng/gods-v2 

chore: upgrade to gods v2
parents 9aa141d0 cb40d604
Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 132 deletions
go.mod
View file @ 9446c2c9
......@@ -4,7 +4,6 @@ go 1.23.4
require (
github.com/containerd/console v1.0.3
github.com/emirpasic/gods v1.18.1
github.com/gin-gonic/gin v1.10.0
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/uuid v1.6.0
......@@ -18,6 +17,7 @@ require (
require (
github.com/agnivade/levenshtein v1.1.1
github.com/d4l3k/go-bfloat16 v0.0.0-20211005043715-690c3bdd05f1
github.com/emirpasic/gods/v2 v2.0.0-alpha
github.com/google/go-cmp v0.6.0
github.com/mattn/go-runewidth v0.0.14
github.com/nlpodyssey/gopickle v0.3.0
......
readline/buffer.go
View file @ 9446c2c9
......@@ -4,7 +4,7 @@ import (
"fmt"
"os"
"github.com/emirpasic/gods/lists/arraylist"
"github.com/emirpasic/gods/v2/lists/arraylist"
"github.com/mattn/go-runewidth"
"golang.org/x/term"
)
......@@ -12,9 +12,9 @@ import (
type Buffer struct {
DisplayPos int
Pos int
Buf *arraylist.List
Buf *arraylist.List[rune]
// LineHasSpace is an arraylist of bools to keep track of whether a line has a space at the end
LineHasSpace *arraylist.List
LineHasSpace *arraylist.List[bool]
Prompt *Prompt
LineWidth int
Width int
......@@ -33,8 +33,8 @@ func NewBuffer(prompt *Prompt) (*Buffer, error) {
b := &Buffer{
DisplayPos: 0,
Pos: 0,
Buf: arraylist.New(),
LineHasSpace: arraylist.New(),
Buf: arraylist.New[rune](),
LineHasSpace: arraylist.New[bool](),
Prompt: prompt,
Width: width,
Height: height,
......@@ -46,19 +46,13 @@ func NewBuffer(prompt *Prompt) (*Buffer, error) {
func (b *Buffer) GetLineSpacing(line int) bool {
hasSpace, _ := b.LineHasSpace.Get(line)
if hasSpace == nil {
return false
}
return hasSpace.(bool)
return hasSpace
}
func (b *Buffer) MoveLeft() {
if b.Pos > 0 {
// asserts that we retrieve a rune
if e, ok := b.Buf.Get(b.Pos - 1); ok {
if r, ok := e.(rune); ok {
if r, ok := b.Buf.Get(b.Pos - 1); ok {
rLength := runewidth.RuneWidth(r)
if b.DisplayPos%b.LineWidth == 0 {
......@@ -81,7 +75,6 @@ func (b *Buffer) MoveLeft() {
b.DisplayPos -= rLength
}
}
}
}
func (b *Buffer) MoveLeftWord() {
......@@ -107,8 +100,7 @@ func (b *Buffer) MoveLeftWord() {
func (b *Buffer) MoveRight() {
if b.Pos < b.Buf.Size() {
if e, ok := b.Buf.Get(b.Pos); ok {
if r, ok := e.(rune); ok {
if r, ok := b.Buf.Get(b.Pos); ok {
rLength := runewidth.RuneWidth(r)
b.Pos += 1
hasSpace := b.GetLineSpacing(b.DisplayPos / b.LineWidth)
......@@ -127,7 +119,6 @@ func (b *Buffer) MoveRight() {
}
}
}
}
}
func (b *Buffer) MoveRightWord() {
......@@ -182,12 +173,10 @@ func (b *Buffer) MoveToEnd() {
func (b *Buffer) DisplaySize() int {
sum := 0
for i := range b.Buf.Size() {
if e, ok := b.Buf.Get(i); ok {
if r, ok := e.(rune); ok {
if r, ok := b.Buf.Get(i); ok {
sum += runewidth.RuneWidth(r)
}
}
}
return sum
}
......@@ -257,11 +246,9 @@ func (b *Buffer) countRemainingLineWidth(place int) int {
for place <= b.LineWidth {
counter += 1
sum += prevLen
if e, ok := b.Buf.Get(b.Pos + counter); ok {
if r, ok := e.(rune); ok {
if r, ok := b.Buf.Get(b.Pos + counter); ok {
place += runewidth.RuneWidth(r)
prevLen = len(string(r))
}
} else {
break
}
......@@ -346,8 +333,7 @@ func (b *Buffer) drawRemaining() {
func (b *Buffer) Remove() {
if b.Buf.Size() > 0 && b.Pos > 0 {
if e, ok := b.Buf.Get(b.Pos - 1); ok {
if r, ok := e.(rune); ok {
if r, ok := b.Buf.Get(b.Pos - 1); ok {
rLength := runewidth.RuneWidth(r)
hasSpace := b.GetLineSpacing(b.DisplayPos/b.LineWidth - 1)
......@@ -407,7 +393,6 @@ func (b *Buffer) Remove() {
}
}
}
}
}
func (b *Buffer) Delete() {
......@@ -536,7 +521,7 @@ func (b *Buffer) StringNM(n, m int) string {
}
for cnt := n; cnt < m; cnt++ {
c, _ := b.Buf.Get(cnt)
s += string(c.(rune))
s += string(c)
}
return s
}
readline/history.go
View file @ 9446c2c9
......@@ -3,16 +3,17 @@ package readline
import (
"bufio"
"errors"
"fmt"
"io"
"os"
"path/filepath"
"strings"
"github.com/emirpasic/gods/lists/arraylist"
"github.com/emirpasic/gods/v2/lists/arraylist"
)
type History struct {
Buf *arraylist.List
Buf *arraylist.List[string]
Autosave bool
Pos int
Limit int
......@@ -22,7 +23,7 @@ type History struct {
func NewHistory() (*History, error) {
h := &History{
Buf: arraylist.New(),
Buf: arraylist.New[string](),
Limit: 100, // resizeme
Autosave: true,
Enabled: true,
......@@ -73,14 +74,14 @@ func (h *History) Init() error {
continue
}
h.Add([]rune(line))
h.Add(line)
}
return nil
}
func (h *History) Add(l []rune) {
h.Buf.Add(l)
func (h *History) Add(s string) {
h.Buf.Add(s)
h.Compact()
h.Pos = h.Size()
if h.Autosave {
......@@ -101,22 +102,18 @@ func (h *History) Clear() {
h.Buf.Clear()
}
func (h *History) Prev() []rune {
var line []rune
func (h *History) Prev() (line string) {
if h.Pos > 0 {
h.Pos -= 1
}
v, _ := h.Buf.Get(h.Pos)
line, _ = v.([]rune)
line, _ = h.Buf.Get(h.Pos)
return line
}
func (h *History) Next() []rune {
var line []rune
func (h *History) Next() (line string) {
if h.Pos < h.Buf.Size() {
h.Pos += 1
v, _ := h.Buf.Get(h.Pos)
line, _ = v.([]rune)
line, _ = h.Buf.Get(h.Pos)
}
return line
}
......@@ -140,11 +137,8 @@ func (h *History) Save() error {
buf := bufio.NewWriter(f)
for cnt := range h.Size() {
v, _ := h.Buf.Get(cnt)
line, _ := v.([]rune)
if _, err := buf.WriteString(string(line) + "\n"); err != nil {
return err
}
line, _ := h.Buf.Get(cnt)
fmt.Fprintln(buf, line)
}
buf.Flush()
f.Close()
......
readline/readline.go
View file @ 9446c2c9
......@@ -120,11 +120,11 @@ func (i *Instance) Readline() (string, error) {
if i.History.Pos == i.History.Size() {
currentLineBuf = []rune(buf.String())
}
buf.Replace(i.History.Prev())
buf.Replace([]rune(i.History.Prev()))
}
case KeyDown:
if i.History.Pos < i.History.Size() {
buf.Replace(i.History.Next())
buf.Replace([]rune(i.History.Next()))
if i.History.Pos == i.History.Size() {
buf.Replace(currentLineBuf)
}
......@@ -220,7 +220,7 @@ func (i *Instance) Readline() (string, error) {
case CharEnter, CharCtrlJ:
output := buf.String()
if output != "" {
i.History.Add([]rune(output))
i.History.Add(output)
}
buf.MoveToEnd()
fmt.Println()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment