a29ec05 · crush · git.iko.soy

git.iko.soy/crush

on main help sign in

fix(tui): permissions: properly pad command block

a29ec05Ayman Bagabas1 year ago

internal/tui/components/dialogs/permissions/permissions.go+2−6

compare with main

unifiedsplit

@@ -16,7 +16,6 @@ import (

16 "github.com/charmbracelet/crush/internal/tui/styles"

17 "github.com/charmbracelet/crush/internal/tui/util"

18 "github.com/charmbracelet/lipgloss/v2"

19− "github.com/charmbracelet/x/ansi"

20)

19)

22type PermissionAction string

21type PermissionAction string

@@ -317,18 +316,14 @@ func (p *permissionDialogCmp) generateBashContent() string {

317 content := pr.Command

316 content := pr.Command

318 t := styles.CurrentTheme()

317 t := styles.CurrentTheme()

319 content = strings.TrimSpace(content)

318 content = strings.TrimSpace(content)

320− content = "\n" + content + "\n"

321 lines := strings.Split(content, "\n")

319 lines := strings.Split(content, "\n")

322

320

323 width := p.width - 4

321 width := p.width - 4

324 var out []string

322 var out []string

325 for _, ln := range lines {

323 for _, ln := range lines {

326− ln = " " + ln // left padding

327− if len(ln) > width {

328− ln = ansi.Truncate(ln, width, "…")

329− }

330 out = append(out, t.S().Muted.

324 out = append(out, t.S().Muted.

331 Width(width).

325 Width(width).

326+ Padding(0, 2).

332 Foreground(t.FgBase).

327 Foreground(t.FgBase).

333 Background(t.BgSubtle).

328 Background(t.BgSubtle).

334 Render(ln))

329 Render(ln))

@@ -338,6 +333,7 @@ func (p *permissionDialogCmp) generateBashContent() string {

338 renderedContent := strings.Join(out, "\n")

333 renderedContent := strings.Join(out, "\n")

339 finalContent := baseStyle.

334 finalContent := baseStyle.

340 Width(p.contentViewPort.Width()).

335 Width(p.contentViewPort.Width()).

336+ Padding(1, 0).

341 Render(renderedContent)

337 Render(renderedContent)

342

338

343 return finalContent

339 return finalContent