Commitccba2ba

authored

fix: Remove line length limit on MacOS for input prompts (#839)

This caused inputs to be truncated on MacOS terminals.

1 parent2a7ab08 commitccba2baCopy full SHA for ccba2ba

File tree

+53

-0

lines changed

+53

-0

lines changed

Lines changed: 31 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,31 @@`
	`1`	`+//go:build darwin`
	`2`	`+// +build darwin`
	`3`	`+`
	`4`	`+package cliui`
	`5`	`+`
	`6`	`+import (`
	`7`	`+"golang.org/x/sys/unix"`
	`8`	`+`
	`9`	`+"golang.org/x/xerrors"`
	`10`	`+)`
	`11`	`+`
	`12`	`+funcremoveLineLengthLimit(inputFDint) (func(),error) {`
	`13`	`+termios,err:=unix.IoctlGetTermios(inputFD,unix.TIOCGETA)`
	`14`	`+iferr!=nil {`
	`15`	`+returnnil,xerrors.Errorf("get termios: %w",err)`
	`16`	`+}`
	`17`	`+newState:=*termios`
	`18`	`+// MacOS has a default line limit of 1024. See:`
	`19`	`+// https://unix.stackexchange.com/questions/204815/terminal-does-not-accept-pasted-or-typed-lines-of-more-than-1024-characters`
	`20`	`+//`
	`21`	`+// This removes canonical input processing, so deletes will not function`
	`22`	`+// as expected. This _seems_ fine for most use-cases, but is unfortunate.`
	`23`	`+newState.Lflag &^=unix.ICANON`
	`24`	`+err=unix.IoctlSetTermios(inputFD,unix.TIOCSETA,&newState)`
	`25`	`+iferr!=nil {`
	`26`	`+returnnil,xerrors.Errorf("set termios: %w",err)`
	`27`	`+}`
	`28`	`+returnfunc() {`
	`29`	`+_=unix.IoctlSetTermios(inputFD,unix.TIOCSETA,termios)`
	`30`	`+},nil`
	`31`	`+}`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,10 @@`
	`1`	`+//go:build !darwin`
	`2`	`+// +build !darwin`
	`3`	`+`
	`4`	`+package cliui`
	`5`	`+`
	`6`	`+import"golang.org/x/xerrors"`
	`7`	`+`
	`8`	`+funcremoveLineLengthLimit(_int) (func(),error) {`
	`9`	`+returnnil,xerrors.New("not implemented")`
	`10`	`+}`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"io"`
`9`	`9`	`"os"`
`10`	`10`	`"os/signal"`
	`11`	`+"runtime"`
`11`	`12`	`"strings"`
`12`	`13`
`13`	`14`	`"github.com/bgentry/speakeasy"`
`@@ -42,10 +43,21 @@ func Prompt(cmd *cobra.Command, opts PromptOptions) (string, error) {`
`42`	`43`	`gofunc() {`
`43`	`44`	`varlinestring`
`44`	`45`	`varerrerror`
	`46`	`+`
`45`	`47`	`inFile,valid:=cmd.InOrStdin().(*os.File)`
`46`	`48`	`ifopts.Secret&&valid&&isatty.IsTerminal(inFile.Fd()) {`
`47`	`49`	`line,err=speakeasy.Ask("")`
`48`	`50`	`}else {`
	`51`	`+ifruntime.GOOS=="darwin"&&valid {`
	`52`	`+varrestorefunc()`
	`53`	`+restore,err=removeLineLengthLimit(int(inFile.Fd()))`
	`54`	`+iferr!=nil {`
	`55`	`+errCh<-err`
	`56`	`+return`
	`57`	`+}`
	`58`	`+deferrestore()`
	`59`	`+}`
	`60`	`+`
`49`	`61`	`reader:=bufio.NewReader(cmd.InOrStdin())`
`50`	`62`	`line,err=reader.ReadString('\n')`
`51`	`63`

Comments

(0)