alihan/crush-code-agent-ide
1
0
Fork 0
mirror of https://github.com/charmbracelet/crush.git synced 2025-08-02 05:20:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor(diffview): simplify how we handle line endings

Browse Source
This commit is contained in:
Andrey Nering
2025-07-23 13:31:39 -03:00
parent da127ca626
commit 78789b8cfb
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/tui/exp/diffview/diffview.go
View File

@@ -193,6 +193,7 @@ func (dv *DiffView) clearSyntaxCache() {
// String returns the string representation of the DiffView.
func (dv *DiffView) String() string {
dv.normalizeLineEndings()
dv.replaceTabs()
if err := dv.computeDiff(); err != nil {
return err.Error()
@@ -227,6 +228,12 @@ func (dv *DiffView) String() string {
}
}
// normalizeLineEndings ensures the file contents use Unix-style line endings.
func (dv *DiffView) normalizeLineEndings() {
dv.before.content = strings.ReplaceAll(dv.before.content, "\r\n", "\n")
dv.after.content = strings.ReplaceAll(dv.after.content, "\r\n", "\n")
}
// replaceTabs replaces tabs in the before and after file contents with spaces
// according to the specified tab width.
func (dv *DiffView) replaceTabs() {
@@ -396,8 +403,7 @@ func (dv *DiffView) renderUnified() string {
shouldWrite := func() bool { return printedLines >= 0 }
getContent := func(in string, ls LineStyle) (content string, leadingEllipsis bool) {
content = strings.ReplaceAll(in, "\r\n", "\n")
content = strings.TrimSuffix(content, "\n")
content = strings.TrimSuffix(in, "\n")
content = dv.hightlightCode(content, ls.Code.GetBackground())
content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content))
content = ansi.Truncate(content, dv.codeWidth, "…")
@@ -520,8 +526,7 @@ func (dv *DiffView) renderSplit() string {
shouldWrite := func() bool { return printedLines >= 0 }
getContent := func(in string, ls LineStyle) (content string, leadingEllipsis bool) {
content = strings.ReplaceAll(in, "\r\n", "\n")
content = strings.TrimSuffix(content, "\n")
content = strings.TrimSuffix(in, "\n")
content = dv.hightlightCode(content, ls.Code.GetBackground())
content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content))
content = ansi.Truncate(content, dv.codeWidth, "…")