| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869 |
- package diff
- import (
- "bytes"
- "fmt"
- "io"
- "regexp"
- "strconv"
- "strings"
- "github.com/alecthomas/chroma/v2"
- "github.com/alecthomas/chroma/v2/formatters"
- "github.com/alecthomas/chroma/v2/lexers"
- "github.com/alecthomas/chroma/v2/styles"
- "github.com/aymanbagabas/go-udiff"
- "github.com/charmbracelet/lipgloss"
- "github.com/charmbracelet/x/ansi"
- "github.com/sergi/go-diff/diffmatchpatch"
- "github.com/sst/opencode/internal/config"
- "github.com/sst/opencode/internal/tui/theme"
- )
- // -------------------------------------------------------------------------
- // Core Types
- // -------------------------------------------------------------------------
- // LineType represents the kind of line in a diff.
- type LineType int
- const (
- LineContext LineType = iota // Line exists in both files
- LineAdded // Line added in the new file
- LineRemoved // Line removed from the old file
- )
- // Segment represents a portion of a line for intra-line highlighting
- type Segment struct {
- Start int
- End int
- Type LineType
- Text string
- }
- // DiffLine represents a single line in a diff
- type DiffLine struct {
- OldLineNo int // Line number in old file (0 for added lines)
- NewLineNo int // Line number in new file (0 for removed lines)
- Kind LineType // Type of line (added, removed, context)
- Content string // Content of the line
- Segments []Segment // Segments for intraline highlighting
- }
- // Hunk represents a section of changes in a diff
- type Hunk struct {
- Header string
- Lines []DiffLine
- }
- // DiffResult contains the parsed result of a diff
- type DiffResult struct {
- OldFile string
- NewFile string
- Hunks []Hunk
- }
- // linePair represents a pair of lines for side-by-side display
- type linePair struct {
- left *DiffLine
- right *DiffLine
- }
- // -------------------------------------------------------------------------
- // Parse Configuration
- // -------------------------------------------------------------------------
- // ParseConfig configures the behavior of diff parsing
- type ParseConfig struct {
- ContextSize int // Number of context lines to include
- }
- // ParseOption modifies a ParseConfig
- type ParseOption func(*ParseConfig)
- // WithContextSize sets the number of context lines to include
- func WithContextSize(size int) ParseOption {
- return func(p *ParseConfig) {
- if size >= 0 {
- p.ContextSize = size
- }
- }
- }
- // -------------------------------------------------------------------------
- // Side-by-Side Configuration
- // -------------------------------------------------------------------------
- // SideBySideConfig configures the rendering of side-by-side diffs
- type SideBySideConfig struct {
- TotalWidth int
- }
- // SideBySideOption modifies a SideBySideConfig
- type SideBySideOption func(*SideBySideConfig)
- // NewSideBySideConfig creates a SideBySideConfig with default values
- func NewSideBySideConfig(opts ...SideBySideOption) SideBySideConfig {
- config := SideBySideConfig{
- TotalWidth: 160, // Default width for side-by-side view
- }
- for _, opt := range opts {
- opt(&config)
- }
- return config
- }
- // WithTotalWidth sets the total width for side-by-side view
- func WithTotalWidth(width int) SideBySideOption {
- return func(s *SideBySideConfig) {
- if width > 0 {
- s.TotalWidth = width
- }
- }
- }
- // -------------------------------------------------------------------------
- // Diff Parsing
- // -------------------------------------------------------------------------
- // ParseUnifiedDiff parses a unified diff format string into structured data
- func ParseUnifiedDiff(diff string) (DiffResult, error) {
- var result DiffResult
- var currentHunk *Hunk
- hunkHeaderRe := regexp.MustCompile(`^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@`)
- lines := strings.Split(diff, "\n")
- var oldLine, newLine int
- inFileHeader := true
- for _, line := range lines {
- // Parse file headers
- if inFileHeader {
- if strings.HasPrefix(line, "--- a/") {
- result.OldFile = strings.TrimPrefix(line, "--- a/")
- continue
- }
- if strings.HasPrefix(line, "+++ b/") {
- result.NewFile = strings.TrimPrefix(line, "+++ b/")
- inFileHeader = false
- continue
- }
- }
- // Parse hunk headers
- if matches := hunkHeaderRe.FindStringSubmatch(line); matches != nil {
- if currentHunk != nil {
- result.Hunks = append(result.Hunks, *currentHunk)
- }
- currentHunk = &Hunk{
- Header: line,
- Lines: []DiffLine{},
- }
- oldStart, _ := strconv.Atoi(matches[1])
- newStart, _ := strconv.Atoi(matches[3])
- oldLine = oldStart
- newLine = newStart
- continue
- }
- // Ignore "No newline at end of file" markers
- if strings.HasPrefix(line, "\\ No newline at end of file") {
- continue
- }
- if currentHunk == nil {
- continue
- }
- // Process the line based on its prefix
- if len(line) > 0 {
- switch line[0] {
- case '+':
- currentHunk.Lines = append(currentHunk.Lines, DiffLine{
- OldLineNo: 0,
- NewLineNo: newLine,
- Kind: LineAdded,
- Content: line[1:],
- })
- newLine++
- case '-':
- currentHunk.Lines = append(currentHunk.Lines, DiffLine{
- OldLineNo: oldLine,
- NewLineNo: 0,
- Kind: LineRemoved,
- Content: line[1:],
- })
- oldLine++
- default:
- currentHunk.Lines = append(currentHunk.Lines, DiffLine{
- OldLineNo: oldLine,
- NewLineNo: newLine,
- Kind: LineContext,
- Content: line,
- })
- oldLine++
- newLine++
- }
- } else {
- // Handle empty lines
- currentHunk.Lines = append(currentHunk.Lines, DiffLine{
- OldLineNo: oldLine,
- NewLineNo: newLine,
- Kind: LineContext,
- Content: "",
- })
- oldLine++
- newLine++
- }
- }
- // Add the last hunk if there is one
- if currentHunk != nil {
- result.Hunks = append(result.Hunks, *currentHunk)
- }
- return result, nil
- }
- // HighlightIntralineChanges updates lines in a hunk to show character-level differences
- func HighlightIntralineChanges(h *Hunk) {
- var updated []DiffLine
- dmp := diffmatchpatch.New()
- for i := 0; i < len(h.Lines); i++ {
- // Look for removed line followed by added line
- if i+1 < len(h.Lines) &&
- h.Lines[i].Kind == LineRemoved &&
- h.Lines[i+1].Kind == LineAdded {
- oldLine := h.Lines[i]
- newLine := h.Lines[i+1]
- // Find character-level differences
- patches := dmp.DiffMain(oldLine.Content, newLine.Content, false)
- patches = dmp.DiffCleanupSemantic(patches)
- patches = dmp.DiffCleanupMerge(patches)
- patches = dmp.DiffCleanupEfficiency(patches)
- segments := make([]Segment, 0)
- removeStart := 0
- addStart := 0
- for _, patch := range patches {
- switch patch.Type {
- case diffmatchpatch.DiffDelete:
- segments = append(segments, Segment{
- Start: removeStart,
- End: removeStart + len(patch.Text),
- Type: LineRemoved,
- Text: patch.Text,
- })
- removeStart += len(patch.Text)
- case diffmatchpatch.DiffInsert:
- segments = append(segments, Segment{
- Start: addStart,
- End: addStart + len(patch.Text),
- Type: LineAdded,
- Text: patch.Text,
- })
- addStart += len(patch.Text)
- default:
- // Context text, no highlighting needed
- removeStart += len(patch.Text)
- addStart += len(patch.Text)
- }
- }
- oldLine.Segments = segments
- newLine.Segments = segments
- updated = append(updated, oldLine, newLine)
- i++ // Skip the next line as we've already processed it
- } else {
- updated = append(updated, h.Lines[i])
- }
- }
- h.Lines = updated
- }
- // pairLines converts a flat list of diff lines to pairs for side-by-side display
- func pairLines(lines []DiffLine) []linePair {
- var pairs []linePair
- i := 0
- for i < len(lines) {
- switch lines[i].Kind {
- case LineRemoved:
- // Check if the next line is an addition, if so pair them
- if i+1 < len(lines) && lines[i+1].Kind == LineAdded {
- pairs = append(pairs, linePair{left: &lines[i], right: &lines[i+1]})
- i += 2
- } else {
- pairs = append(pairs, linePair{left: &lines[i], right: nil})
- i++
- }
- case LineAdded:
- pairs = append(pairs, linePair{left: nil, right: &lines[i]})
- i++
- case LineContext:
- pairs = append(pairs, linePair{left: &lines[i], right: &lines[i]})
- i++
- }
- }
- return pairs
- }
- // -------------------------------------------------------------------------
- // Syntax Highlighting
- // -------------------------------------------------------------------------
- // SyntaxHighlight applies syntax highlighting to text based on file extension
- func SyntaxHighlight(w io.Writer, source, fileName, formatter string, bg lipgloss.TerminalColor) error {
- t := theme.CurrentTheme()
- // Determine the language lexer to use
- l := lexers.Match(fileName)
- if l == nil {
- l = lexers.Analyse(source)
- }
- if l == nil {
- l = lexers.Fallback
- }
- l = chroma.Coalesce(l)
- // Get the formatter
- f := formatters.Get(formatter)
- if f == nil {
- f = formatters.Fallback
- }
- // Dynamic theme based on current theme values
- syntaxThemeXml := fmt.Sprintf(`
- <style name="opencode-theme">
- <!-- Base colors -->
- <entry type="Background" style="bg:%s"/>
- <entry type="Text" style="%s"/>
- <entry type="Other" style="%s"/>
- <entry type="Error" style="%s"/>
- <!-- Keywords -->
- <entry type="Keyword" style="%s"/>
- <entry type="KeywordConstant" style="%s"/>
- <entry type="KeywordDeclaration" style="%s"/>
- <entry type="KeywordNamespace" style="%s"/>
- <entry type="KeywordPseudo" style="%s"/>
- <entry type="KeywordReserved" style="%s"/>
- <entry type="KeywordType" style="%s"/>
- <!-- Names -->
- <entry type="Name" style="%s"/>
- <entry type="NameAttribute" style="%s"/>
- <entry type="NameBuiltin" style="%s"/>
- <entry type="NameBuiltinPseudo" style="%s"/>
- <entry type="NameClass" style="%s"/>
- <entry type="NameConstant" style="%s"/>
- <entry type="NameDecorator" style="%s"/>
- <entry type="NameEntity" style="%s"/>
- <entry type="NameException" style="%s"/>
- <entry type="NameFunction" style="%s"/>
- <entry type="NameLabel" style="%s"/>
- <entry type="NameNamespace" style="%s"/>
- <entry type="NameOther" style="%s"/>
- <entry type="NameTag" style="%s"/>
- <entry type="NameVariable" style="%s"/>
- <entry type="NameVariableClass" style="%s"/>
- <entry type="NameVariableGlobal" style="%s"/>
- <entry type="NameVariableInstance" style="%s"/>
- <!-- Literals -->
- <entry type="Literal" style="%s"/>
- <entry type="LiteralDate" style="%s"/>
- <entry type="LiteralString" style="%s"/>
- <entry type="LiteralStringBacktick" style="%s"/>
- <entry type="LiteralStringChar" style="%s"/>
- <entry type="LiteralStringDoc" style="%s"/>
- <entry type="LiteralStringDouble" style="%s"/>
- <entry type="LiteralStringEscape" style="%s"/>
- <entry type="LiteralStringHeredoc" style="%s"/>
- <entry type="LiteralStringInterpol" style="%s"/>
- <entry type="LiteralStringOther" style="%s"/>
- <entry type="LiteralStringRegex" style="%s"/>
- <entry type="LiteralStringSingle" style="%s"/>
- <entry type="LiteralStringSymbol" style="%s"/>
- <!-- Numbers -->
- <entry type="LiteralNumber" style="%s"/>
- <entry type="LiteralNumberBin" style="%s"/>
- <entry type="LiteralNumberFloat" style="%s"/>
- <entry type="LiteralNumberHex" style="%s"/>
- <entry type="LiteralNumberInteger" style="%s"/>
- <entry type="LiteralNumberIntegerLong" style="%s"/>
- <entry type="LiteralNumberOct" style="%s"/>
- <!-- Operators -->
- <entry type="Operator" style="%s"/>
- <entry type="OperatorWord" style="%s"/>
- <entry type="Punctuation" style="%s"/>
- <!-- Comments -->
- <entry type="Comment" style="%s"/>
- <entry type="CommentHashbang" style="%s"/>
- <entry type="CommentMultiline" style="%s"/>
- <entry type="CommentSingle" style="%s"/>
- <entry type="CommentSpecial" style="%s"/>
- <entry type="CommentPreproc" style="%s"/>
- <!-- Generic styles -->
- <entry type="Generic" style="%s"/>
- <entry type="GenericDeleted" style="%s"/>
- <entry type="GenericEmph" style="italic %s"/>
- <entry type="GenericError" style="%s"/>
- <entry type="GenericHeading" style="bold %s"/>
- <entry type="GenericInserted" style="%s"/>
- <entry type="GenericOutput" style="%s"/>
- <entry type="GenericPrompt" style="%s"/>
- <entry type="GenericStrong" style="bold %s"/>
- <entry type="GenericSubheading" style="bold %s"/>
- <entry type="GenericTraceback" style="%s"/>
- <entry type="GenericUnderline" style="underline"/>
- <entry type="TextWhitespace" style="%s"/>
- </style>
- `,
- getColor(t.Background()), // Background
- getColor(t.Text()), // Text
- getColor(t.Text()), // Other
- getColor(t.Error()), // Error
- getColor(t.SyntaxKeyword()), // Keyword
- getColor(t.SyntaxKeyword()), // KeywordConstant
- getColor(t.SyntaxKeyword()), // KeywordDeclaration
- getColor(t.SyntaxKeyword()), // KeywordNamespace
- getColor(t.SyntaxKeyword()), // KeywordPseudo
- getColor(t.SyntaxKeyword()), // KeywordReserved
- getColor(t.SyntaxType()), // KeywordType
- getColor(t.Text()), // Name
- getColor(t.SyntaxVariable()), // NameAttribute
- getColor(t.SyntaxType()), // NameBuiltin
- getColor(t.SyntaxVariable()), // NameBuiltinPseudo
- getColor(t.SyntaxType()), // NameClass
- getColor(t.SyntaxVariable()), // NameConstant
- getColor(t.SyntaxFunction()), // NameDecorator
- getColor(t.SyntaxVariable()), // NameEntity
- getColor(t.SyntaxType()), // NameException
- getColor(t.SyntaxFunction()), // NameFunction
- getColor(t.Text()), // NameLabel
- getColor(t.SyntaxType()), // NameNamespace
- getColor(t.SyntaxVariable()), // NameOther
- getColor(t.SyntaxKeyword()), // NameTag
- getColor(t.SyntaxVariable()), // NameVariable
- getColor(t.SyntaxVariable()), // NameVariableClass
- getColor(t.SyntaxVariable()), // NameVariableGlobal
- getColor(t.SyntaxVariable()), // NameVariableInstance
- getColor(t.SyntaxString()), // Literal
- getColor(t.SyntaxString()), // LiteralDate
- getColor(t.SyntaxString()), // LiteralString
- getColor(t.SyntaxString()), // LiteralStringBacktick
- getColor(t.SyntaxString()), // LiteralStringChar
- getColor(t.SyntaxString()), // LiteralStringDoc
- getColor(t.SyntaxString()), // LiteralStringDouble
- getColor(t.SyntaxString()), // LiteralStringEscape
- getColor(t.SyntaxString()), // LiteralStringHeredoc
- getColor(t.SyntaxString()), // LiteralStringInterpol
- getColor(t.SyntaxString()), // LiteralStringOther
- getColor(t.SyntaxString()), // LiteralStringRegex
- getColor(t.SyntaxString()), // LiteralStringSingle
- getColor(t.SyntaxString()), // LiteralStringSymbol
- getColor(t.SyntaxNumber()), // LiteralNumber
- getColor(t.SyntaxNumber()), // LiteralNumberBin
- getColor(t.SyntaxNumber()), // LiteralNumberFloat
- getColor(t.SyntaxNumber()), // LiteralNumberHex
- getColor(t.SyntaxNumber()), // LiteralNumberInteger
- getColor(t.SyntaxNumber()), // LiteralNumberIntegerLong
- getColor(t.SyntaxNumber()), // LiteralNumberOct
- getColor(t.SyntaxOperator()), // Operator
- getColor(t.SyntaxKeyword()), // OperatorWord
- getColor(t.SyntaxPunctuation()), // Punctuation
- getColor(t.SyntaxComment()), // Comment
- getColor(t.SyntaxComment()), // CommentHashbang
- getColor(t.SyntaxComment()), // CommentMultiline
- getColor(t.SyntaxComment()), // CommentSingle
- getColor(t.SyntaxComment()), // CommentSpecial
- getColor(t.SyntaxKeyword()), // CommentPreproc
- getColor(t.Text()), // Generic
- getColor(t.Error()), // GenericDeleted
- getColor(t.Text()), // GenericEmph
- getColor(t.Error()), // GenericError
- getColor(t.Text()), // GenericHeading
- getColor(t.Success()), // GenericInserted
- getColor(t.TextMuted()), // GenericOutput
- getColor(t.Text()), // GenericPrompt
- getColor(t.Text()), // GenericStrong
- getColor(t.Text()), // GenericSubheading
- getColor(t.Error()), // GenericTraceback
- getColor(t.Text()), // TextWhitespace
- )
- r := strings.NewReader(syntaxThemeXml)
- style := chroma.MustNewXMLStyle(r)
- // Modify the style to use the provided background
- s, err := style.Builder().Transform(
- func(t chroma.StyleEntry) chroma.StyleEntry {
- r, g, b, _ := bg.RGBA()
- t.Background = chroma.NewColour(uint8(r>>8), uint8(g>>8), uint8(b>>8))
- return t
- },
- ).Build()
- if err != nil {
- s = styles.Fallback
- }
- // Tokenize and format
- it, err := l.Tokenise(nil, source)
- if err != nil {
- return err
- }
- return f.Format(w, s, it)
- }
- // getColor returns the appropriate hex color string based on terminal background
- func getColor(adaptiveColor lipgloss.AdaptiveColor) string {
- if lipgloss.HasDarkBackground() {
- return adaptiveColor.Dark
- }
- return adaptiveColor.Light
- }
- // highlightLine applies syntax highlighting to a single line
- func highlightLine(fileName string, line string, bg lipgloss.TerminalColor) string {
- var buf bytes.Buffer
- err := SyntaxHighlight(&buf, line, fileName, "terminal16m", bg)
- if err != nil {
- return line
- }
- return buf.String()
- }
- // createStyles generates the lipgloss styles needed for rendering diffs
- func createStyles(t theme.Theme) (removedLineStyle, addedLineStyle, contextLineStyle, lineNumberStyle lipgloss.Style) {
- removedLineStyle = lipgloss.NewStyle().Background(t.DiffRemovedBg())
- addedLineStyle = lipgloss.NewStyle().Background(t.DiffAddedBg())
- contextLineStyle = lipgloss.NewStyle().Background(t.DiffContextBg())
- lineNumberStyle = lipgloss.NewStyle().Foreground(t.DiffLineNumber())
- return
- }
- // -------------------------------------------------------------------------
- // Rendering Functions
- // -------------------------------------------------------------------------
- // applyHighlighting applies intra-line highlighting to a piece of text
- func applyHighlighting(content string, segments []Segment, segmentType LineType, highlightBg lipgloss.AdaptiveColor) string {
- // Find all ANSI sequences in the content
- ansiRegex := regexp.MustCompile(`\x1b(?:[@-Z\\-_]|\[[0-9?]*(?:;[0-9?]*)*[@-~])`)
- ansiMatches := ansiRegex.FindAllStringIndex(content, -1)
- // Build a mapping of visible character positions to their actual indices
- visibleIdx := 0
- ansiSequences := make(map[int]string)
- lastAnsiSeq := "\x1b[0m" // Default reset sequence
- for i := 0; i < len(content); {
- isAnsi := false
- for _, match := range ansiMatches {
- if match[0] == i {
- ansiSequences[visibleIdx] = content[match[0]:match[1]]
- lastAnsiSeq = content[match[0]:match[1]]
- i = match[1]
- isAnsi = true
- break
- }
- }
- if isAnsi {
- continue
- }
- // For non-ANSI positions, store the last ANSI sequence
- if _, exists := ansiSequences[visibleIdx]; !exists {
- ansiSequences[visibleIdx] = lastAnsiSeq
- }
- visibleIdx++
- i++
- }
- // Apply highlighting
- var sb strings.Builder
- inSelection := false
- currentPos := 0
- // Get the appropriate color based on terminal background
- bgColor := lipgloss.Color(getColor(highlightBg))
- fgColor := lipgloss.Color(getColor(theme.CurrentTheme().Background()))
- for i := 0; i < len(content); {
- // Check if we're at an ANSI sequence
- isAnsi := false
- for _, match := range ansiMatches {
- if match[0] == i {
- sb.WriteString(content[match[0]:match[1]]) // Preserve ANSI sequence
- i = match[1]
- isAnsi = true
- break
- }
- }
- if isAnsi {
- continue
- }
- // Check for segment boundaries
- for _, seg := range segments {
- if seg.Type == segmentType {
- if currentPos == seg.Start {
- inSelection = true
- }
- if currentPos == seg.End {
- inSelection = false
- }
- }
- }
- // Get current character
- char := string(content[i])
- if inSelection {
- // Get the current styling
- currentStyle := ansiSequences[currentPos]
- // Apply foreground and background highlight
- sb.WriteString("\x1b[38;2;")
- r, g, b, _ := fgColor.RGBA()
- sb.WriteString(fmt.Sprintf("%d;%d;%dm", r>>8, g>>8, b>>8))
- sb.WriteString("\x1b[48;2;")
- r, g, b, _ = bgColor.RGBA()
- sb.WriteString(fmt.Sprintf("%d;%d;%dm", r>>8, g>>8, b>>8))
- sb.WriteString(char)
- // Full reset of all attributes to ensure clean state
- sb.WriteString("\x1b[0m")
- // Reapply the original ANSI sequence
- sb.WriteString(currentStyle)
- } else {
- // Not in selection, just copy the character
- sb.WriteString(char)
- }
- currentPos++
- i++
- }
- return sb.String()
- }
- // renderDiffColumnLine is a helper function that handles the common logic for rendering diff columns
- func renderDiffColumnLine(
- fileName string,
- dl *DiffLine,
- colWidth int,
- isLeftColumn bool,
- t theme.Theme,
- ) string {
- if dl == nil {
- contextLineStyle := lipgloss.NewStyle().Background(t.DiffContextBg())
- return contextLineStyle.Width(colWidth).Render("")
- }
- removedLineStyle, addedLineStyle, contextLineStyle, lineNumberStyle := createStyles(t)
- // Determine line style based on line type and column
- var marker string
- var bgStyle lipgloss.Style
- var lineNum string
- var highlightType LineType
- var highlightColor lipgloss.AdaptiveColor
- if isLeftColumn {
- // Left column logic
- switch dl.Kind {
- case LineRemoved:
- marker = "-"
- bgStyle = removedLineStyle
- lineNumberStyle = lineNumberStyle.Foreground(t.DiffRemoved()).Background(t.DiffRemovedLineNumberBg())
- highlightType = LineRemoved
- highlightColor = t.DiffHighlightRemoved()
- case LineAdded:
- marker = "?"
- bgStyle = contextLineStyle
- case LineContext:
- marker = " "
- bgStyle = contextLineStyle
- }
- // Format line number for left column
- if dl.OldLineNo > 0 {
- lineNum = fmt.Sprintf("%6d", dl.OldLineNo)
- }
- } else {
- // Right column logic
- switch dl.Kind {
- case LineAdded:
- marker = "+"
- bgStyle = addedLineStyle
- lineNumberStyle = lineNumberStyle.Foreground(t.DiffAdded()).Background(t.DiffAddedLineNumberBg())
- highlightType = LineAdded
- highlightColor = t.DiffHighlightAdded()
- case LineRemoved:
- marker = "?"
- bgStyle = contextLineStyle
- case LineContext:
- marker = " "
- bgStyle = contextLineStyle
- }
- // Format line number for right column
- if dl.NewLineNo > 0 {
- lineNum = fmt.Sprintf("%6d", dl.NewLineNo)
- }
- }
- // Style the marker based on line type
- var styledMarker string
- switch dl.Kind {
- case LineRemoved:
- styledMarker = removedLineStyle.Foreground(t.DiffRemoved()).Render(marker)
- case LineAdded:
- styledMarker = addedLineStyle.Foreground(t.DiffAdded()).Render(marker)
- case LineContext:
- styledMarker = contextLineStyle.Foreground(t.TextMuted()).Render(marker)
- default:
- styledMarker = marker
- }
- // Create the line prefix
- prefix := lineNumberStyle.Render(lineNum + " " + styledMarker)
- // Apply syntax highlighting
- content := highlightLine(fileName, dl.Content, bgStyle.GetBackground())
- // Apply intra-line highlighting if needed
- if (dl.Kind == LineRemoved && isLeftColumn || dl.Kind == LineAdded && !isLeftColumn) && len(dl.Segments) > 0 {
- content = applyHighlighting(content, dl.Segments, highlightType, highlightColor)
- }
- // Add a padding space for added/removed lines
- if (dl.Kind == LineRemoved && isLeftColumn) || (dl.Kind == LineAdded && !isLeftColumn) {
- content = bgStyle.Render(" ") + content
- }
- // Create the final line and truncate if needed
- lineText := prefix + content
- return bgStyle.MaxHeight(1).Width(colWidth).Render(
- ansi.Truncate(
- lineText,
- colWidth,
- lipgloss.NewStyle().Background(bgStyle.GetBackground()).Foreground(t.TextMuted()).Render("..."),
- ),
- )
- }
- // renderLeftColumn formats the left side of a side-by-side diff
- func renderLeftColumn(fileName string, dl *DiffLine, colWidth int) string {
- return renderDiffColumnLine(fileName, dl, colWidth, true, theme.CurrentTheme())
- }
- // renderRightColumn formats the right side of a side-by-side diff
- func renderRightColumn(fileName string, dl *DiffLine, colWidth int) string {
- return renderDiffColumnLine(fileName, dl, colWidth, false, theme.CurrentTheme())
- }
- // -------------------------------------------------------------------------
- // Public API
- // -------------------------------------------------------------------------
- // RenderSideBySideHunk formats a hunk for side-by-side display
- func RenderSideBySideHunk(fileName string, h Hunk, opts ...SideBySideOption) string {
- // Apply options to create the configuration
- config := NewSideBySideConfig(opts...)
- // Make a copy of the hunk so we don't modify the original
- hunkCopy := Hunk{Lines: make([]DiffLine, len(h.Lines))}
- copy(hunkCopy.Lines, h.Lines)
- // Highlight changes within lines
- HighlightIntralineChanges(&hunkCopy)
- // Pair lines for side-by-side display
- pairs := pairLines(hunkCopy.Lines)
- // Calculate column width
- colWidth := config.TotalWidth / 2
- leftWidth := colWidth
- rightWidth := config.TotalWidth - colWidth
- var sb strings.Builder
- for _, p := range pairs {
- leftStr := renderLeftColumn(fileName, p.left, leftWidth)
- rightStr := renderRightColumn(fileName, p.right, rightWidth)
- sb.WriteString(leftStr + rightStr + "\n")
- }
- return sb.String()
- }
- // FormatDiff creates a side-by-side formatted view of a diff
- func FormatDiff(diffText string, opts ...SideBySideOption) (string, error) {
- t := theme.CurrentTheme()
- diffResult, err := ParseUnifiedDiff(diffText)
- if err != nil {
- return "", err
- }
- var sb strings.Builder
- config := NewSideBySideConfig(opts...)
- for _, h := range diffResult.Hunks {
- sb.WriteString(
- lipgloss.NewStyle().
- Background(t.DiffHunkHeader()).
- Foreground(t.Background()).
- Width(config.TotalWidth).
- Render(h.Header) + "\n",
- )
- sb.WriteString(RenderSideBySideHunk(diffResult.OldFile, h, opts...))
- }
- return sb.String(), nil
- }
- // GenerateDiff creates a unified diff from two file contents
- func GenerateDiff(beforeContent, afterContent, fileName string) (string, int, int) {
- // remove the cwd prefix and ensure consistent path format
- // this prevents issues with absolute paths in different environments
- cwd := config.WorkingDirectory()
- fileName = strings.TrimPrefix(fileName, cwd)
- fileName = strings.TrimPrefix(fileName, "/")
- edits := udiff.Strings(beforeContent, afterContent)
- unified, _ := udiff.ToUnified("a/"+fileName, "b/"+fileName, beforeContent, edits, 8)
- var (
- additions = 0
- removals = 0
- )
- lines := strings.SplitSeq(unified, "\n")
- for line := range lines {
- if strings.HasPrefix(line, "+") && !strings.HasPrefix(line, "+++") {
- additions++
- } else if strings.HasPrefix(line, "-") && !strings.HasPrefix(line, "---") {
- removals++
- }
- }
- return unified, additions, removals
- }
|