Merge pull request #650 from zemzale/fix-pager-issue

Fix(pager): Resolve background color before staring pager

commands/issue/view/issue_view.go

@@ -26,9 +26,8 @@ type ViewOpts struct {
 	CommentPageNumber int
 	CommentLimit      int
 
-	Notes        []*gitlab.Note
-	Issue        *gitlab.Issue
-	GlamourStyle string
+	Notes []*gitlab.Note
+	Issue *gitlab.Issue
 
 	IO *iostreams.IOStreams
 }
@@ -75,8 +74,6 @@ func NewCmdView(f *cmdutils.Factory) *cobra.Command {
 				return utils.OpenInBrowser(opts.Issue.WebURL, browser)
 			}
 
-			opts.GlamourStyle, _ = cfg.Get(baseRepo.RepoHost(), "glamour_style")
-
 			if opts.ShowComments {
 				l := &gitlab.ListIssueNotesOptions{
 					Sort: gitlab.String("asc"),
@@ -93,6 +90,8 @@ func NewCmdView(f *cmdutils.Factory) *cobra.Command {
 				}
 			}
 
+			glamourStyle, _ := cfg.Get(baseRepo.RepoHost(), "glamour_style")
+			f.IO.ResolveBackgroundColor(glamourStyle)
 			err = f.IO.StartPager()
 			if err != nil {
 				return err
@@ -154,7 +153,7 @@ func printTTYIssuePreview(opts *ViewOpts) error {
 
 	// Description
 	if opts.Issue.Description != "" {
-		opts.Issue.Description, _ = utils.RenderMarkdown(opts.Issue.Description, opts.GlamourStyle)
+		opts.Issue.Description, _ = utils.RenderMarkdown(opts.Issue.Description, opts.IO.BackgroundColor())
 		fmt.Fprintln(opts.IO.StdOut, opts.Issue.Description)
 	}
 
@@ -195,7 +194,7 @@ func printTTYIssuePreview(opts *ViewOpts) error {
 					fmt.Fprintf(opts.IO.StdOut, " %s ", note.Body)
 					fmt.Fprintln(opts.IO.StdOut, c.Gray(createdAt))
 				} else {
-					body, _ := utils.RenderMarkdown(note.Body, opts.GlamourStyle)
+					body, _ := utils.RenderMarkdown(note.Body, opts.IO.BackgroundColor())
 					fmt.Fprint(opts.IO.StdOut, " commented ")
 					fmt.Fprintf(opts.IO.StdOut, c.Gray("%s\n"), createdAt)
 					fmt.Fprintln(opts.IO.StdOut, utils.Indent(body, " "))

commands/mr/view/mr_view.go

@@ -77,14 +77,15 @@ func NewCmdView(f *cmdutils.Factory) *cobra.Command {
 				}
 			}
 
+			glamourStyle, _ := cfg.Get(baseRepo.RepoHost(), "glamour_style")
+			f.IO.ResolveBackgroundColor(glamourStyle)
 			if err := f.IO.StartPager(); err != nil {
 				return err
 			}
 			defer f.IO.StopPager()
 
 			if f.IO.IsOutputTTY() {
-				glamourStyle, _ := cfg.Get(baseRepo.RepoHost(), "glamour_style")
-				return printTTYMRPreview(opts, mr, notes, glamourStyle)
+				return printTTYMRPreview(opts, mr, notes)
 			}
 			return printRawMRPreview(opts, mr)
 		},
@@ -127,7 +128,7 @@ func mrState(c *iostreams.ColorPalette, mr *gitlab.MergeRequest) (mrState string
 	return mrState
 }
 
-func printTTYMRPreview(opts *ViewOpts, mr *gitlab.MergeRequest, notes []*gitlab.Note, glamourStyle string) error {
+func printTTYMRPreview(opts *ViewOpts, mr *gitlab.MergeRequest, notes []*gitlab.Note) error {
 	c := opts.IO.Color()
 	out := opts.IO.StdOut
 	mrTimeAgo := utils.TimeToPrettyTimeAgo(*mr.CreatedAt)
@@ -140,7 +141,7 @@ func printTTYMRPreview(opts *ViewOpts, mr *gitlab.MergeRequest, notes []*gitlab.
 
 	// Description
 	if mr.Description != "" {
-		mr.Description, _ = utils.RenderMarkdown(mr.Description, glamourStyle)
+		mr.Description, _ = utils.RenderMarkdown(mr.Description, opts.IO.BackgroundColor())
 		fmt.Fprintln(out, mr.Description)
 	}
 
@@ -206,7 +207,7 @@ func printTTYMRPreview(opts *ViewOpts, mr *gitlab.MergeRequest, notes []*gitlab.
 					fmt.Fprintf(out, " %s ", note.Body)
 					fmt.Fprintln(out, c.Gray(createdAt))
 				} else {
-					body, _ := utils.RenderMarkdown(note.Body, glamourStyle)
+					body, _ := utils.RenderMarkdown(note.Body, opts.IO.BackgroundColor())
 					fmt.Fprint(out, " commented ")
 					fmt.Fprintf(out, c.Gray("%s\n"), createdAt)
 					fmt.Fprintln(out, utils.Indent(body, " "))

go.mod

@@ -24,6 +24,7 @@ require (
 	github.com/mattn/go-runewidth v0.0.10
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
 	github.com/mitchellh/go-homedir v1.1.0
+	github.com/muesli/termenv v0.6.0
 	github.com/otiai10/copy v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/rivo/tview v0.0.0-20210117162420-745e4ceeb711