From ae5e158bbdee80db89f019f9469f579cdff2de7a Mon Sep 17 00:00:00 2001 From: Christian Rocha Date: Wed, 27 May 2020 11:55:00 -0400 Subject: [PATCH] Unstyled indent (for now) --- ui/stash.go | 3 +-- ui/ui.go | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ui/stash.go b/ui/stash.go index 12ea063..443879e 100644 --- a/ui/stash.go +++ b/ui/stash.go @@ -14,7 +14,6 @@ import ( "github.com/charmbracelet/charm" "github.com/charmbracelet/charm/ui/common" "github.com/dustin/go-humanize" - "github.com/muesli/reflow/indent" te "github.com/muesli/termenv" ) @@ -438,7 +437,7 @@ func stashView(m stashModel) string { stashHelpView(m), ) } - return "\n" + indent.String(s, 1) + return "\n" + indent(s, 1) } func glowLogoView(text string) string { diff --git a/ui/ui.go b/ui/ui.go index 14113dd..007fb87 100644 --- a/ui/ui.go +++ b/ui/ui.go @@ -3,13 +3,13 @@ package ui import ( "errors" "fmt" + "strings" "github.com/charmbracelet/bubbles/spinner" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/charm" "github.com/charmbracelet/charm/ui/common" "github.com/charmbracelet/charm/ui/keygen" - "github.com/muesli/reflow/indent" te "github.com/muesli/termenv" ) @@ -294,7 +294,7 @@ func view(mdl tea.Model) string { return pagerView(m.pager) } - return "\n" + indent.String(s, 2) + return "\n" + indent(s, 2) } // COMMANDS @@ -327,6 +327,19 @@ func newCharmClient() tea.Msg { return newCharmClientMsg(cc) } +func indent(s string, n int) string { + if n <= 0 || s == "" { + return s + } + l := strings.Split(s, "\n") + b := strings.Builder{} + i := strings.Repeat(" ", n) + for _, v := range l { + fmt.Fprintf(&b, "%s%s\n", i, v) + } + return b.String() +} + // ETC func min(a, b int) int {