Skip to content

Commit

Permalink
chore(lint): wrap various TTY-related errors
Browse files Browse the repository at this point in the history
  • Loading branch information
meowgorithm committed Jul 6, 2023
1 parent ea7ceb7 commit 613fbde
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
7 changes: 4 additions & 3 deletions tty.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package tea

import (
"errors"
"fmt"
"io"
"os"
"time"
Expand All @@ -21,7 +22,7 @@ func (p *Program) initTerminal() error {
if p.console != nil {
err = p.console.SetRaw()
if err != nil {
return err
return fmt.Errorf("error entering raw mode: %w", err)
}
}

Expand All @@ -48,7 +49,7 @@ func (p *Program) restoreTerminalState() error {
if p.console != nil {
err := p.console.Reset()
if err != nil {
return err
return fmt.Errorf("error restoring terminal state: %w", err)
}
}

Expand All @@ -60,7 +61,7 @@ func (p *Program) initCancelReader() error {
var err error
p.cancelReader, err = cancelreader.NewReader(p.input)
if err != nil {
return err
return fmt.Errorf("error creating cancelreader: %w", err)
}

p.readLoopDone = make(chan struct{})
Expand Down
7 changes: 5 additions & 2 deletions tty_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package tea

import (
"fmt"
"os"

"github.com/containerd/console"
Expand All @@ -28,15 +29,17 @@ func (p *Program) initInput() error {
// program exits.
func (p *Program) restoreInput() error {
if p.console != nil {
return p.console.Reset()
if err := p.console.Reset(); err != nil {
return fmt.Errorf("error restoring console: %w", err)
}
}
return nil
}

func openInputTTY() (*os.File, error) {
f, err := os.Open("/dev/tty")
if err != nil {
return nil, err
return nil, fmt.Errorf("could not open a new TTY: %w", err)
}
return f, nil
}

0 comments on commit 613fbde

Please sign in to comment.