705d6f6 · crush · git.iko.soy

git.iko.soy/crush

fix(sidebar): compute the right line count even on windows / crlf

The diff library we're using assumes LF, so we need to convert CRLF to LF to ensure it works properly.

commit705d6f6a6a0116a8ca62a7cd5fae1ec470909f39 authorAndrey Nering <andreynering@users.noreply.github.com> dateMon 11 Aug 2025, 15:40 (1 year ago) parenta3efafc

1 file changed+6−3

compare with main

unifiedsplit

internal/tui/components/chat/sidebar/sidebar.go+6−3

internal/tui/components/chat/sidebar/sidebar.go+6−3

@@ -12,6 +12,7 @@ import (

1212 "github.com/charmbracelet/crush/internal/config"

1313 "github.com/charmbracelet/crush/internal/csync"

1414 "github.com/charmbracelet/crush/internal/diff"

15+ "github.com/charmbracelet/crush/internal/fsext"

1516 "github.com/charmbracelet/crush/internal/history"

1617 "github.com/charmbracelet/crush/internal/lsp"

1718 "github.com/charmbracelet/crush/internal/pubsub"

@@ -190,8 +191,8 @@ func (m *sidebarCmp) handleFileHistoryEvent(event pubsub.Event[history.File]) te

190191 // If the version is not greater than the latest, we ignore it

191192 continue

192193 }

193− before := existing.History.initialVersion.Content

194− after := existing.History.latestVersion.Content

194+ before, _ := fsext.ToUnixLineEndings(existing.History.initialVersion.Content)

195+ after, _ := fsext.ToUnixLineEndings(existing.History.latestVersion.Content)

195196 path := existing.History.initialVersion.Path

196197 cwd := config.Get().WorkingDir()

197198 path = strings.TrimPrefix(path, cwd)

@@ -248,7 +249,9 @@ func (m *sidebarCmp) loadSessionFiles() tea.Msg {

248249 for path, fh := range fileMap {

249250 cwd := config.Get().WorkingDir()

250251 path = strings.TrimPrefix(path, cwd)

251− _, additions, deletions := diff.GenerateDiff(fh.initialVersion.Content, fh.latestVersion.Content, path)

252+ before, _ := fsext.ToUnixLineEndings(fh.initialVersion.Content)

253+ after, _ := fsext.ToUnixLineEndings(fh.latestVersion.Content)

254+ _, additions, deletions := diff.GenerateDiff(before, after, path)

252255 sessionFiles = append(sessionFiles, SessionFile{

253256 History: fh,

254257 FilePath: path,