fix: lint

Signed-off-by: drew <me@andrinoff.com>
This commit is contained in:
drew 2026-09-22 14:03:03 +04:00
parent 5187ca8e8b
commit ce8b5107c4
No known key found for this signature in database
GPG key ID: 877E0EA9036E900E
2 changed files with 48 additions and 8 deletions

View file

@ -3,11 +3,25 @@
package tea
import uv "github.com/charmbracelet/ultraviolet"
import (
"os/exec"
// newLocalClipboardBackend always returns nil on Windows: Windows Terminal
// supports OSC52 natively, and Windows has no clipboard tool that can read the
// clipboard without an additional dependency.
uv "github.com/charmbracelet/ultraviolet"
)
// newLocalClipboardBackend returns a clipboard backend backed by the Windows
// clip.exe tool, or nil when it is not available.
//
// Windows Terminal supports OSC52 natively, so this is only used on terminals
// without OSC52 support. clip.exe can only write, so reads report
// [ErrClipboardUnavailable].
func newLocalClipboardBackend(uv.Environ) ClipboardBackend {
return nil
clip, err := exec.LookPath("clip")
if err != nil {
return nil
}
return commandClipboardBackend{
set: func(ClipboardSelection) (string, []string) { return clip, nil },
get: func(ClipboardSelection) (string, []string) { return "", nil },
}
}

View file

@ -3,14 +3,22 @@ package tea
import (
"fmt"
"io"
"os"
"os/exec"
"sync"
"time"
uv "github.com/charmbracelet/ultraviolet"
"github.com/charmbracelet/x/term"
xpty "github.com/charmbracelet/x/xpty"
)
// ptyDrainTimeout bounds how long execBridged waits for a command's output to
// be drained before giving up and closing the pseudo-terminal. It is long
// enough to drain the kernel's pty buffer, and keeps the program from hanging
// when a command's descendants keep the pty open after it exits.
const ptyDrainTimeout = 500 * time.Millisecond
// execBridged runs c on a pseudo-terminal and bridges its clipboard traffic
// through the program's clipboard backend. This is what makes copy and paste
// work in external programs running on terminals without OSC52 support, in the
@ -40,6 +48,13 @@ func (p *Program) execBridged(c *exec.Cmd) error {
return fmt.Errorf("bubbletea: could not start command on pty: %w", err)
}
// Close the slave end in the parent, so that the command is its only
// holder. When the command exits, reads on the master report EOF after
// draining its output, instead of blocking forever.
if slave, ok := pt.(interface{ Slave() *os.File }); ok {
_ = slave.Slave().Close()
}
var wg sync.WaitGroup
done := make(chan struct{})
@ -91,14 +106,25 @@ func (p *Program) execBridged(c *exec.Cmd) error {
waitErr := xpty.WaitProcess(p.ctx, c)
// Stop forwarding and wait for the goroutines, so they don't steal input
// from the program once it resumes.
// Stop forwarding, then wait for the pumps to drain the command's output
// before closing the pseudo-terminal. Output written just before the
// command exited may still be buffered in the pty, and closing it too
// early would discard it. Waiting also ensures the goroutines don't steal
// input from the program once it resumes.
stop()
if cancelInput != nil {
cancelInput()
}
drained := make(chan struct{})
go func() {
wg.Wait()
close(drained)
}()
select {
case <-drained:
case <-time.After(ptyDrainTimeout):
}
_ = pt.Close()
wg.Wait()
if waitErr != nil {
return fmt.Errorf("bubbletea: command failed: %w", waitErr)