zoriya/jjui
1
0
Fork 0
mirror of https://github.com/zoriya/jjui.git synced 2026-08-16 02:44:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(preview): set preview subprocess size via env (#608)

Browse Source 
* Set preview subprocess size via env
This commit is contained in:
Oliver Joseph Ash
2026-03-20 00:02:30 +00:00
committed by GitHub
parent 2d1d51af2a
commit e7be3e02aa
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ui/context/command_runner.go
+9 -1
View File
@@ -21,6 +21,7 @@ import (
type CommandRunner interface {
RunCommandImmediate(args []string) ([]byte, error)
RunCommandImmediateWithEnv(args []string, env []string) ([]byte, error)
RunCommandStreaming(ctx context.Context, args []string) (*StreamingCommand, error)
RunCommand(args []string, continuations ...tea.Cmd) tea.Cmd
RunCommandWithInput(args []string, input string, continuations ...tea.Cmd) tea.Cmd
@@ -35,9 +36,12 @@ type MainCommandRunner struct {
func (a *MainCommandRunner) nextID() int { return int(a.idCounter.Add(1)) }
func (a *MainCommandRunner) RunCommandImmediate(args []string) ([]byte, error) {
func (a *MainCommandRunner) RunCommandImmediateWithEnv(args []string, env []string) ([]byte, error) {
c := exec.Command("jj", args...)
c.Dir = a.Location
if len(env) > 0 {
c.Env = append(os.Environ(), env...)
}
if output, err := c.Output(); err != nil {
var exitError *exec.ExitError
if errors.As(err, &exitError) {
@@ -49,6 +53,10 @@ func (a *MainCommandRunner) RunCommandImmediate(args []string) ([]byte, error) {
}
}
func (a *MainCommandRunner) RunCommandImmediate(args []string) ([]byte, error) {
return a.RunCommandImmediateWithEnv(args, nil)
}
func (a *MainCommandRunner) RunCommandStreaming(ctx context.Context, args []string) (*StreamingCommand, error) {
c := exec.CommandContext(ctx, "jj", args...)
c.Dir = a.Location
internal/ui/preview/preview.go
+8 -1
View File
@@ -219,7 +219,14 @@ func (m *Model) refreshPreviewForItem(item common.SelectedItem) tea.Cmd {
})
}
output, _ := m.context.RunCommandImmediate(args)
env := []string{
// The preview subprocess does not run in a pane-sized PTY, so let
// width-sensitive tools like `jj diff` see the preview size via the
// conventional terminal size environment variables.
"COLUMNS=" + strconv.Itoa(m.view.Width()),
"LINES=" + strconv.Itoa(m.view.Height()),
}
output, _ := m.context.RunCommandImmediateWithEnv(args, env)
return updatePreviewContentMsg{
Content: string(output),
}
test/test_command_runner.go
+4
View File
@@ -59,6 +59,10 @@ func (t *CommandRunner) RunCommandImmediate(args []string) ([]byte, error) {
return nil, nil
}
func (t *CommandRunner) RunCommandImmediateWithEnv(args []string, _ []string) ([]byte, error) {
return t.RunCommandImmediate(args)
}
func (t *CommandRunner) RunCommandStreaming(_ context.Context, args []string) (*appContext.StreamingCommand, error) {
reader, err := t.RunCommandImmediate(args)
return &appContext.StreamingCommand{