Render hyperlinks in the command log output panel

pkg/gui/command_log_panel.go

@@ -40,6 +40,7 @@ func (gui *Gui) LogCommand(cmdStr string, commandLine bool) {
 	}
 
 	gui.Views.Extras.Autoscroll = true
+	gui.Views.Extras.UnderlineHyperLinksOnlyOnHover = true
 
 	textStyle := theme.DefaultTextColor
 	if !commandLine {
@@ -64,7 +65,7 @@ func (gui *Gui) printCommandLogHeader() {
 			gui.Views.Extras,
 			"%s: %s",
 			style.FgYellow.Sprint(gui.c.Tr.RandomTip),
-			style.FgGreen.Sprint(gui.getRandomTip()),
+			style.FgGreen.Sprint(style.UnderlineLinks(gui.getRandomTip())),
 		)
 	}
 }

pkg/gui/controllers/helpers/confirmation_helper.go

@@ -221,7 +221,7 @@ func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts typ
 		confirmationView.RenderTextArea()
 	} else {
 		self.c.ResetViewOrigin(confirmationView)
-		self.c.SetViewContent(confirmationView, style.AttrBold.Sprint(underlineLinks(opts.Prompt)))
+		self.c.SetViewContent(confirmationView, style.AttrBold.Sprint(style.UnderlineLinks(opts.Prompt)))
 	}
 
 	self.setKeyBindings(cancel, opts)
@@ -233,28 +233,6 @@ func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts typ
 	self.c.Context().Push(self.c.Contexts().Confirmation)
 }
 
-func underlineLinks(text string) string {
-	result := ""
-	remaining := text
-	for {
-		linkStart := strings.Index(remaining, "https://")
-		if linkStart == -1 {
-			break
-		}
-
-		linkEnd := strings.IndexAny(remaining[linkStart:], " \n>")
-		if linkEnd == -1 {
-			linkEnd = len(remaining)
-		} else {
-			linkEnd += linkStart
-		}
-		underlinedLink := style.PrintSimpleHyperlink(remaining[linkStart:linkEnd])
-		result += remaining[:linkStart] + underlinedLink
-		remaining = remaining[linkEnd:]
-	}
-	return result + remaining
-}
-
 func (self *ConfirmationHelper) setKeyBindings(cancel goContext.CancelFunc, opts types.CreatePopupPanelOpts) {
 	var onConfirm func() error
 	if opts.HandleConfirmPrompt != nil {

pkg/gui/extras_panel.go

@@ -59,7 +59,7 @@ func (gui *Gui) scrollDownExtra() error {
 }
 
 func (gui *Gui) getCmdWriter() io.Writer {
-	return &prefixWriter{writer: gui.Views.Extras, prefix: style.FgMagenta.Sprintf("\n\n%s\n", gui.c.Tr.GitOutput)}
+	return &prefixWriter{writer: gui.Views.Extras, prefix: style.FgMagenta.Sprintf("\n\n%s\n", style.UnderlineLinks(gui.c.Tr.GitOutput))}
 }
 
 // Ensures that the first write is preceded by writing a prefix.
@@ -80,5 +80,5 @@ func (self *prefixWriter) Write(p []byte) (int, error) {
 			return n, err
 		}
 	}
-	return self.writer.Write(p)
+	return self.writer.Write([]byte(style.UnderlineLinks(p)))
 }

pkg/gui/style/hyperlink.go

@@ -1,6 +1,9 @@
 package style
 
-import "fmt"
+import (
+	"fmt"
+	"strings"
+)
 
 // Render the given text as an OSC 8 hyperlink
 func PrintHyperlink(text string, link string) string {
@@ -11,3 +14,25 @@ func PrintHyperlink(text string, link string) string {
 func PrintSimpleHyperlink(link string) string {
 	return fmt.Sprintf("\033]8;;%s\033\\%s\033]8;;\033\\", link, link)
 }
+
+func UnderlineLinks[T string | []byte](text T) string {
+	result := ""
+	remaining := string(text)
+	for {
+		linkStart := strings.Index(remaining, "https://")
+		if linkStart == -1 {
+			break
+		}
+
+		linkEnd := strings.IndexAny(remaining[linkStart:], " \n>")
+		if linkEnd == -1 {
+			linkEnd = len(remaining)
+		} else {
+			linkEnd += linkStart
+		}
+		underlinedLink := PrintSimpleHyperlink(remaining[linkStart:linkEnd])
+		result += remaining[:linkStart] + underlinedLink
+		remaining = remaining[linkEnd:]
+	}
+	return result + remaining
+}

pkg/gui/controllers/helpers/confirmation_helper_test.go → pkg/gui/style/hyperlink_test.go

@@ -1,4 +1,4 @@
-package helpers
+package style
 
 import (
 	"testing"
@@ -56,7 +56,7 @@ func Test_underlineLinks(t *testing.T) {
 
 	for _, s := range scenarios {
 		t.Run(s.name, func(t *testing.T) {
-			result := underlineLinks(s.text)
+			result := UnderlineLinks(s.text)
 			assert.Equal(t, s.expectedResult, result)
 		})
 	}