Merge branch 'golang:master' into patch-1

qxxt · web-flow · commit 39cb14de3378 · 2023-06-26T20:56:06.000+07:00
diff --git a/AUTHORS b/AUTHORS
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
diff --git a/go.mod b/go.mod
@@ -2,4 +2,4 @@ module golang.org/x/term
 
 go 1.17
 
-require golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1
+require golang.org/x/sys v0.9.0
diff --git a/go.sum b/go.sum
@@ -1,2 +1,2 @@
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
diff --git a/term.go b/term.go
@@ -7,11 +7,11 @@
 //
 // Putting a terminal into raw mode is the most common requirement:
 //
-// 	oldState, err := term.MakeRaw(int(os.Stdin.Fd()))
-// 	if err != nil {
-// 	        panic(err)
-// 	}
-// 	defer term.Restore(int(os.Stdin.Fd()), oldState)
+//	oldState, err := term.MakeRaw(int(os.Stdin.Fd()))
+//	if err != nil {
+//	        panic(err)
+//	}
+//	defer term.Restore(int(os.Stdin.Fd()), oldState)
 //
 // Note that on non-Unix systems os.Stdin.Fd() may not be 0.
 package term
diff --git a/term_test.go b/term_test.go
@@ -5,7 +5,6 @@
 package term_test
 
 import (
-	"io/ioutil"
 	"os"
 	"runtime"
 	"testing"
@@ -14,7 +13,7 @@ import (
 )
 
 func TestIsTerminalTempFile(t *testing.T) {
-	file, err := ioutil.TempFile("", "TestIsTerminalTempFile")
+	file, err := os.CreateTemp("", "TestIsTerminalTempFile")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/terminal.go b/terminal.go
@@ -233,7 +233,6 @@ func (t *Terminal) queue(data []rune) {
 	t.outBuf = append(t.outBuf, []byte(string(data))...)
 }
 
-var eraseUnderCursor = []rune{' ', keyEscape, '[', 'D'}
 var space = []rune{' '}
 
 func isPrintable(key rune) bool {
@@ -935,7 +934,7 @@ func (s *stRingBuffer) Add(a string) {
 // next most recent, and so on. If such an element doesn't exist then ok is
 // false.
 func (s *stRingBuffer) NthPreviousEntry(n int) (value string, ok bool) {
-	if n >= s.size {
+	if n < 0 || n >= s.size {
 		return "", false
 	}
 	index := s.head - n

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ module golang.org/x/term`
`2`	`2`
`3`	`3`	`go 1.17`
`4`	`4`
`5`		`-require golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1`
	`5`	`+require golang.org/x/sys v0.9.0`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`package term_test`
`6`	`6`
`7`	`7`	`import (`
`8`		`- "io/ioutil"`
`9`	`8`	`"os"`
`10`	`9`	`"runtime"`
`11`	`10`	`"testing"`
`@@ -14,7 +13,7 @@ import (`
`14`	`13`	`)`
`15`	`14`
`16`	`15`	`func TestIsTerminalTempFile(t *testing.T) {`
`17`		`- file, err := ioutil.TempFile("", "TestIsTerminalTempFile")`
	`16`	`+ file, err := os.CreateTemp("", "TestIsTerminalTempFile")`
`18`	`17`	`if err != nil {`
`19`	`18`	`t.Fatal(err)`
`20`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,6 @@ func (t *Terminal) queue(data []rune) {`
`233`	`233`	`t.outBuf = append(t.outBuf, []byte(string(data))...)`
`234`	`234`	`}`
`235`	`235`
`236`		`-var eraseUnderCursor = []rune{' ', keyEscape, '[', 'D'}`
`237`	`236`	`var space = []rune{' '}`
`238`	`237`
`239`	`238`	`func isPrintable(key rune) bool {`
`@@ -935,7 +934,7 @@ func (s *stRingBuffer) Add(a string) {`
`935`	`934`	`// next most recent, and so on. If such an element doesn't exist then ok is`
`936`	`935`	`// false.`
`937`	`936`	`func (s *stRingBuffer) NthPreviousEntry(n int) (value string, ok bool) {`
`938`		`- if n >= s.size {`
	`937`	`+ if n < 0 \|\| n >= s.size {`
`939`	`938`	`return "", false`
`940`	`939`	`}`
`941`	`940`	`index := s.head - n`