Store TextStyle in Pipe struct as pointer

stefanhaller · stefanhaller · commit e63abf89db68 · 2025-04-29T14:57:15.000+02:00
The instances are held by the AuthorStyle cache.
diff --git a/pkg/gui/presentation/authors/authors.go b/pkg/gui/presentation/authors/authors.go
@@ -21,7 +21,7 @@ type authorNameCacheKey struct {
 var (
 	authorInitialCache = make(map[string]string)
 	authorNameCache    = make(map[authorNameCacheKey]string)
-	authorStyleCache   = make(map[string]style.TextStyle)
+	authorStyleCache   = make(map[string]*style.TextStyle)
 )
 
 const authorNameWildcard = "*"
@@ -73,7 +73,7 @@ func AuthorWithLength(authorName string, length int) string {
 	return LongAuthor(authorName, length)
 }
 
-func AuthorStyle(authorName string) style.TextStyle {
+func AuthorStyle(authorName string) *style.TextStyle {
 	if value, ok := authorStyleCache[authorName]; ok {
 		return value
 	}
@@ -85,9 +85,9 @@ func AuthorStyle(authorName string) style.TextStyle {
 
 	value := trueColorStyle(authorName)
 
-	authorStyleCache[authorName] = value
+	authorStyleCache[authorName] = &value
 
-	return value
+	return &value
 }
 
 func trueColorStyle(str string) style.TextStyle {
diff --git a/pkg/gui/presentation/branches.go b/pkg/gui/presentation/branches.go
@@ -20,7 +20,7 @@ import (
 )
 
 type colorMatcher struct {
-	patterns map[string]style.TextStyle
+	patterns map[string]*style.TextStyle
 	isRegex  bool // NOTE: this value is needed only until the deprecated branchColors config is removed and only regex color patterns are used
 }
 
@@ -142,14 +142,14 @@ func (m *colorMatcher) match(name string) (*style.TextStyle, bool) {
 	if m.isRegex {
 		for pattern, style := range m.patterns {
 			if matched, _ := regexp.MatchString(pattern, name); matched {
-				return &style, true
+				return style, true
 			}
 		}
 	} else {
 		// old behavior using the deprecated branchColors behavior matching on branch type
 		branchType := strings.Split(name, "/")[0]
 		if value, ok := m.patterns[branchType]; ok {
-			return &value, true
+			return value, true
 		}
 	}
 
diff --git a/pkg/gui/presentation/commits.go b/pkg/gui/presentation/commits.go
@@ -258,7 +258,7 @@ func loadPipesets(commits []*models.Commit) [][]graph.Pipe {
 	if !ok {
 		// pipe sets are unique to a commit head. and a commit count. Sometimes we haven't loaded everything for that.
 		// so let's just cache it based on that.
-		getStyle := func(commit *models.Commit) style.TextStyle {
+		getStyle := func(commit *models.Commit) *style.TextStyle {
 			return authors.AuthorStyle(commit.AuthorName)
 		}
 		pipeSets = graph.GetPipeSets(commits, getStyle)
diff --git a/pkg/gui/presentation/graph/cell.go b/pkg/gui/presentation/graph/cell.go
@@ -25,7 +25,7 @@ type Cell struct {
 	up, down, left, right bool
 	cellType              cellType
 	rightStyle            *style.TextStyle
-	style                 style.TextStyle
+	style                 *style.TextStyle
 }
 
 func (cell *Cell) render(writer io.StringWriter) {
@@ -44,7 +44,7 @@ func (cell *Cell) render(writer io.StringWriter) {
 
 	var rightStyle *style.TextStyle
 	if cell.rightStyle == nil {
-		rightStyle = &cell.style
+		rightStyle = cell.style
 	} else {
 		rightStyle = cell.rightStyle
 	}
@@ -59,7 +59,7 @@ func (cell *Cell) render(writer io.StringWriter) {
 		styledSecondChar = cachedSprint(*rightStyle, second)
 	}
 
-	_, _ = writer.WriteString(cachedSprint(cell.style, adjustedFirst))
+	_, _ = writer.WriteString(cachedSprint(*cell.style, adjustedFirst))
 	_, _ = writer.WriteString(styledSecondChar)
 }
 
@@ -104,19 +104,19 @@ func (cell *Cell) reset() {
 	cell.right = false
 }
 
-func (cell *Cell) setUp(style style.TextStyle) *Cell {
+func (cell *Cell) setUp(style *style.TextStyle) *Cell {
 	cell.up = true
 	cell.style = style
 	return cell
 }
 
-func (cell *Cell) setDown(style style.TextStyle) *Cell {
+func (cell *Cell) setDown(style *style.TextStyle) *Cell {
 	cell.down = true
 	cell.style = style
 	return cell
 }
 
-func (cell *Cell) setLeft(style style.TextStyle) *Cell {
+func (cell *Cell) setLeft(style *style.TextStyle) *Cell {
 	cell.left = true
 	if !cell.up && !cell.down {
 		// vertical trumps left
@@ -126,15 +126,15 @@ func (cell *Cell) setLeft(style style.TextStyle) *Cell {
 }
 
 //nolint:unparam
-func (cell *Cell) setRight(style style.TextStyle, override bool) *Cell {
+func (cell *Cell) setRight(style *style.TextStyle, override bool) *Cell {
 	cell.right = true
 	if cell.rightStyle == nil || override {
-		cell.rightStyle = &style
+		cell.rightStyle = style
 	}
 	return cell
 }
 
-func (cell *Cell) setStyle(style style.TextStyle) *Cell {
+func (cell *Cell) setStyle(style *style.TextStyle) *Cell {
 	cell.style = style
 	return cell
 }
diff --git a/pkg/gui/presentation/graph/graph.go b/pkg/gui/presentation/graph/graph.go
@@ -28,7 +28,7 @@ type Pipe struct {
 	fromHash *string
 	toHash   *string
 	kind     PipeKind
-	style    style.TextStyle
+	style    *style.TextStyle
 }
 
 var (
@@ -45,7 +45,7 @@ func (self Pipe) right() int {
 	return max(self.fromPos, self.toPos)
 }
 
-func RenderCommitGraph(commits []*models.Commit, selectedCommitHashPtr *string, getStyle func(c *models.Commit) style.TextStyle) []string {
+func RenderCommitGraph(commits []*models.Commit, selectedCommitHashPtr *string, getStyle func(c *models.Commit) *style.TextStyle) []string {
 	pipeSets := GetPipeSets(commits, getStyle)
 	if len(pipeSets) == 0 {
 		return nil
@@ -56,12 +56,12 @@ func RenderCommitGraph(commits []*models.Commit, selectedCommitHashPtr *string,
 	return lines
 }
 
-func GetPipeSets(commits []*models.Commit, getStyle func(c *models.Commit) style.TextStyle) [][]Pipe {
+func GetPipeSets(commits []*models.Commit, getStyle func(c *models.Commit) *style.TextStyle) [][]Pipe {
 	if len(commits) == 0 {
 		return nil
 	}
 
-	pipes := []Pipe{{fromPos: 0, toPos: 0, fromHash: &StartCommitHash, toHash: commits[0].HashPtr(), kind: STARTS, style: style.FgDefault}}
+	pipes := []Pipe{{fromPos: 0, toPos: 0, fromHash: &StartCommitHash, toHash: commits[0].HashPtr(), kind: STARTS, style: &style.FgDefault}}
 
 	return lo.Map(commits, func(commit *models.Commit, _ int) []Pipe {
 		pipes = getNextPipes(pipes, commit, getStyle)
@@ -106,7 +106,7 @@ func RenderAux(pipeSets [][]Pipe, commits []*models.Commit, selectedCommitHashPt
 	return lo.Flatten(chunks)
 }
 
-func getNextPipes(prevPipes []Pipe, commit *models.Commit, getStyle func(c *models.Commit) style.TextStyle) []Pipe {
+func getNextPipes(prevPipes []Pipe, commit *models.Commit, getStyle func(c *models.Commit) *style.TextStyle) []Pipe {
 	maxPos := 0
 	for _, pipe := range prevPipes {
 		if pipe.toPos > maxPos {
@@ -293,10 +293,10 @@ func renderPipeSet(
 	isMerge := startCount > 1
 
 	cells := lo.Map(lo.Range(maxPos+1), func(i int, _ int) *Cell {
-		return &Cell{cellType: CONNECTION, style: style.FgDefault}
+		return &Cell{cellType: CONNECTION, style: &style.FgDefault}
 	})
 
-	renderPipe := func(pipe *Pipe, style style.TextStyle, overrideRightStyle bool) {
+	renderPipe := func(pipe *Pipe, style *style.TextStyle, overrideRightStyle bool) {
 		left := pipe.left()
 		right := pipe.right()
 
@@ -352,9 +352,9 @@ func renderPipeSet(
 		}
 	}
 	for _, pipe := range selectedPipes {
-		renderPipe(&pipe, highlightStyle, true)
+		renderPipe(&pipe, &highlightStyle, true)
 		if pipe.toPos == commitPos {
-			cells[pipe.toPos].setStyle(highlightStyle)
+			cells[pipe.toPos].setStyle(&highlightStyle)
 		}
 	}
 
diff --git a/pkg/gui/presentation/graph/graph_test.go b/pkg/gui/presentation/graph/graph_test.go
diff --git a/pkg/utils/color.go b/pkg/utils/color.go

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ type authorNameCacheKey struct {`
`21`	`21`	`var (`
`22`	`22`	`authorInitialCache = make(map[string]string)`
`23`	`23`	`authorNameCache = make(map[authorNameCacheKey]string)`
`24`		`- authorStyleCache = make(map[string]style.TextStyle)`
	`24`	`+ authorStyleCache = make(map[string]*style.TextStyle)`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`const authorNameWildcard = "*"`
`@@ -73,7 +73,7 @@ func AuthorWithLength(authorName string, length int) string {`
`73`	`73`	`return LongAuthor(authorName, length)`
`74`	`74`	`}`
`75`	`75`
`76`		`-func AuthorStyle(authorName string) style.TextStyle {`
	`76`	`+func AuthorStyle(authorName string) *style.TextStyle {`
`77`	`77`	`if value, ok := authorStyleCache[authorName]; ok {`
`78`	`78`	`return value`
`79`	`79`	`}`
`@@ -85,9 +85,9 @@ func AuthorStyle(authorName string) style.TextStyle {`
`85`	`85`
`86`	`86`	`value := trueColorStyle(authorName)`
`87`	`87`
`88`		`- authorStyleCache[authorName] = value`
	`88`	`+ authorStyleCache[authorName] = &value`
`89`	`89`
`90`		`- return value`
	`90`	`+ return &value`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`func trueColorStyle(str string) style.TextStyle {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`type colorMatcher struct {`
`23`		`- patterns map[string]style.TextStyle`
	`23`	`+ patterns map[string]*style.TextStyle`
`24`	`24`	`isRegex bool // NOTE: this value is needed only until the deprecated branchColors config is removed and only regex color patterns are used`
`25`	`25`	`}`
`26`	`26`
`@@ -142,14 +142,14 @@ func (m colorMatcher) match(name string) (style.TextStyle, bool) {`
`142`	`142`	`if m.isRegex {`
`143`	`143`	`for pattern, style := range m.patterns {`
`144`	`144`	`if matched, _ := regexp.MatchString(pattern, name); matched {`
`145`		`- return &style, true`
	`145`	`+ return style, true`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`	`} else {`
`149`	`149`	`// old behavior using the deprecated branchColors behavior matching on branch type`
`150`	`150`	`branchType := strings.Split(name, "/")[0]`
`151`	`151`	`if value, ok := m.patterns[branchType]; ok {`
`152`		`- return &value, true`
	`152`	`+ return value, true`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ func loadPipesets(commits []*models.Commit) [][]graph.Pipe {`
`258`	`258`	`if !ok {`
`259`	`259`	`// pipe sets are unique to a commit head. and a commit count. Sometimes we haven't loaded everything for that.`
`260`	`260`	`// so let's just cache it based on that.`
`261`		`- getStyle := func(commit *models.Commit) style.TextStyle {`
	`261`	`+ getStyle := func(commit models.Commit) style.TextStyle {`
`262`	`262`	`return authors.AuthorStyle(commit.AuthorName)`
`263`	`263`	`}`
`264`	`264`	`pipeSets = graph.GetPipeSets(commits, getStyle)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ type Cell struct {`
`25`	`25`	`up, down, left, right bool`
`26`	`26`	`cellType cellType`
`27`	`27`	`rightStyle *style.TextStyle`
`28`		`- style style.TextStyle`
	`28`	`+ style *style.TextStyle`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func (cell *Cell) render(writer io.StringWriter) {`
`@@ -44,7 +44,7 @@ func (cell *Cell) render(writer io.StringWriter) {`
`44`	`44`
`45`	`45`	`var rightStyle *style.TextStyle`
`46`	`46`	`if cell.rightStyle == nil {`
`47`		`- rightStyle = &cell.style`
	`47`	`+ rightStyle = cell.style`
`48`	`48`	`} else {`
`49`	`49`	`rightStyle = cell.rightStyle`
`50`	`50`	`}`
`@@ -59,7 +59,7 @@ func (cell *Cell) render(writer io.StringWriter) {`
`59`	`59`	`styledSecondChar = cachedSprint(*rightStyle, second)`
`60`	`60`	`}`
`61`	`61`
`62`		`- _, _ = writer.WriteString(cachedSprint(cell.style, adjustedFirst))`
	`62`	`+ _, _ = writer.WriteString(cachedSprint(*cell.style, adjustedFirst))`
`63`	`63`	`_, _ = writer.WriteString(styledSecondChar)`
`64`	`64`	`}`
`65`	`65`
`@@ -104,19 +104,19 @@ func (cell *Cell) reset() {`
`104`	`104`	`cell.right = false`
`105`	`105`	`}`
`106`	`106`
`107`		`-func (cell Cell) setUp(style style.TextStyle) Cell {`
	`107`	`+func (cell Cell) setUp(style style.TextStyle) *Cell {`
`108`	`108`	`cell.up = true`
`109`	`109`	`cell.style = style`
`110`	`110`	`return cell`
`111`	`111`	`}`
`112`	`112`
`113`		`-func (cell Cell) setDown(style style.TextStyle) Cell {`
	`113`	`+func (cell Cell) setDown(style style.TextStyle) *Cell {`
`114`	`114`	`cell.down = true`
`115`	`115`	`cell.style = style`
`116`	`116`	`return cell`
`117`	`117`	`}`
`118`	`118`
`119`		`-func (cell Cell) setLeft(style style.TextStyle) Cell {`
	`119`	`+func (cell Cell) setLeft(style style.TextStyle) *Cell {`
`120`	`120`	`cell.left = true`
`121`	`121`	`if !cell.up && !cell.down {`
`122`	`122`	`// vertical trumps left`
`@@ -126,15 +126,15 @@ func (cell Cell) setLeft(style style.TextStyle) Cell {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`//nolint:unparam`
`129`		`-func (cell Cell) setRight(style style.TextStyle, override bool) Cell {`
	`129`	`+func (cell Cell) setRight(style style.TextStyle, override bool) *Cell {`
`130`	`130`	`cell.right = true`
`131`	`131`	`if cell.rightStyle == nil \|\| override {`
`132`		`- cell.rightStyle = &style`
	`132`	`+ cell.rightStyle = style`
`133`	`133`	`}`
`134`	`134`	`return cell`
`135`	`135`	`}`
`136`	`136`
`137`		`-func (cell Cell) setStyle(style style.TextStyle) Cell {`
	`137`	`+func (cell Cell) setStyle(style style.TextStyle) *Cell {`
`138`	`138`	`cell.style = style`
`139`	`139`	`return cell`
`140`	`140`	`}`