diff --git a/internal/ui/graph/graph_row_renderer.go b/internal/ui/graph/default_row_renderer.go similarity index 74% rename from internal/ui/graph/graph_row_renderer.go rename to internal/ui/graph/default_row_renderer.go index 103fd35..ac59653 100644 --- a/internal/ui/graph/graph_row_renderer.go +++ b/internal/ui/graph/default_row_renderer.go @@ -9,27 +9,27 @@ import ( "github.com/idursun/jjui/internal/ui/operations" ) -type SegmentedRenderer struct { +type DefaultRowRenderer struct { Palette common.Palette IsHighlighted bool Op operations.Operation } -func (s SegmentedRenderer) RenderBefore(*jj.Commit) string { +func (s DefaultRowRenderer) RenderBefore(*jj.Commit) string { if s.IsHighlighted && s.Op.RenderPosition() == operations.RenderPositionBefore { return s.Op.Render() } return "" } -func (s SegmentedRenderer) RenderAfter(*jj.Commit) string { +func (s DefaultRowRenderer) RenderAfter(*jj.Commit) string { if s.IsHighlighted && s.Op.RenderPosition() == operations.RenderPositionAfter { return s.Op.Render() } return "" } -func (s SegmentedRenderer) RenderGlyph(connection jj.ConnectionType, commit *jj.Commit) string { +func (s DefaultRowRenderer) RenderGlyph(connection jj.ConnectionType, commit *jj.Commit) string { style := s.Palette.Normal opMarker := "" if s.IsHighlighted { @@ -41,11 +41,11 @@ func (s SegmentedRenderer) RenderGlyph(connection jj.ConnectionType, commit *jj. return style.Render(string(connection) + opMarker) } -func (s SegmentedRenderer) RenderTermination(connection jj.ConnectionType) string { +func (s DefaultRowRenderer) RenderTermination(connection jj.ConnectionType) string { return s.Palette.Elided.Render(string(connection)) } -func (s SegmentedRenderer) RenderChangeId(commit *jj.Commit) string { +func (s DefaultRowRenderer) RenderChangeId(commit *jj.Commit) string { hidden := "" if commit.Hidden { hidden = s.Palette.Normal.Render(" hidden") @@ -54,28 +54,28 @@ func (s SegmentedRenderer) RenderChangeId(commit *jj.Commit) string { return fmt.Sprintf("%s%s %s", s.Palette.ChangeId.Render(commit.ChangeIdShort), s.Palette.Rest.Render(commit.ChangeId[len(commit.ChangeIdShort):]), hidden) } -func (s SegmentedRenderer) RenderCommitId(commit *jj.Commit) string { +func (s DefaultRowRenderer) RenderCommitId(commit *jj.Commit) string { if commit.IsRoot() { return "" } return s.Palette.CommitId.Render(commit.CommitIdShort) + s.Palette.Rest.Render(commit.CommitId[len(commit.ChangeIdShort):]) } -func (s SegmentedRenderer) RenderAuthor(commit *jj.Commit) string { +func (s DefaultRowRenderer) RenderAuthor(commit *jj.Commit) string { if commit.IsRoot() { return s.Palette.EmptyPlaceholder.Render("root()") } return s.Palette.Author.Render(commit.Author) } -func (s SegmentedRenderer) RenderDate(commit *jj.Commit) string { +func (s DefaultRowRenderer) RenderDate(commit *jj.Commit) string { if commit.IsRoot() { return "" } return s.Palette.Timestamp.Render(commit.Timestamp) } -func (s SegmentedRenderer) RenderBookmarks(commit *jj.Commit) string { +func (s DefaultRowRenderer) RenderBookmarks(commit *jj.Commit) string { var w strings.Builder if s.IsHighlighted && s.Op.RenderPosition() == operations.RenderPositionBookmark { w.WriteString(s.Op.Render()) @@ -86,14 +86,14 @@ func (s SegmentedRenderer) RenderBookmarks(commit *jj.Commit) string { return w.String() } -func (s SegmentedRenderer) RenderMarkers(commit *jj.Commit) string { +func (s DefaultRowRenderer) RenderMarkers(commit *jj.Commit) string { if commit.Conflict { return s.Palette.Conflict.Render("conflict") } return "" } -func (s SegmentedRenderer) RenderDescription(commit *jj.Commit) string { +func (s DefaultRowRenderer) RenderDescription(commit *jj.Commit) string { if s.IsHighlighted && s.Op.RenderPosition() == operations.RenderPositionDescription { return s.Op.Render() } diff --git a/internal/ui/operations/evolog/evolog_operation.go b/internal/ui/operations/evolog/evolog_operation.go index f1860f5..beb9f63 100644 --- a/internal/ui/operations/evolog/evolog_operation.go +++ b/internal/ui/operations/evolog/evolog_operation.go @@ -86,7 +86,7 @@ func (o Operation) Render() string { selectedLineStart := -1 selectedLineEnd := -1 for i, row := range o.rows { - nodeRenderer := graph.SegmentedRenderer{ + nodeRenderer := graph.DefaultRowRenderer{ Palette: common.DefaultPalette, Op: &operations.Noop{}, IsHighlighted: i == o.cursor, diff --git a/internal/ui/revisions/revisions.go b/internal/ui/revisions/revisions.go index 2dd4f3e..5ac1132 100644 --- a/internal/ui/revisions/revisions.go +++ b/internal/ui/revisions/revisions.go @@ -245,7 +245,7 @@ func (m *Model) View() string { selectedLineStart := -1 selectedLineEnd := -1 for i, row := range m.rows { - nodeRenderer := graph.SegmentedRenderer{ + nodeRenderer := graph.DefaultRowRenderer{ Palette: common.DefaultPalette, Op: m.op, IsHighlighted: i == m.cursor,