go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-08 22:36:49 +02:00
Code Issues Releases Activity

Fix commit searching during rebase or in divergence from upstream view (#4730)

Browse Source 
- **PR Description**

Fix search results being off by two lines during a rebase or in the
divergence from upstream view.
This commit is contained in:
Stefan Haller
2025-07-12 17:36:26 +02:00
committed by GitHub
parent 228d4428ca 2b41a27d92
commit 7d92260050
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/gui/context/list_renderer.go
View File

@ -99,17 +99,19 @@ func (self *ListRenderer) renderLines(startIdx int, endIdx int) string {
func (self *ListRenderer) prepareConversionArrays(nonModelItems []*NonModelItem) { func (self *ListRenderer) prepareConversionArrays(nonModelItems []*NonModelItem) {
self.numNonModelItems = len(nonModelItems) self.numNonModelItems = len(nonModelItems)
self.viewIndicesByModelIndex = lo.Range(self.list.Len() + 1) viewIndicesByModelIndex := lo.Range(self.list.Len() + 1)
self.modelIndicesByViewIndex = lo.Range(self.list.Len() + 1) modelIndicesByViewIndex := lo.Range(self.list.Len() + 1)
offset := 0 offset := 0
for _, item := range nonModelItems { for _, item := range nonModelItems {
for i := item.Index; i <= self.list.Len(); i++ { for i := item.Index; i <= self.list.Len(); i++ {
self.viewIndicesByModelIndex[i]++ viewIndicesByModelIndex[i]++
} }
self.modelIndicesByViewIndex = slices.Insert( modelIndicesByViewIndex = slices.Insert(
self.modelIndicesByViewIndex, item.Index+offset, self.modelIndicesByViewIndex[item.Index+offset]) modelIndicesByViewIndex, item.Index+offset, modelIndicesByViewIndex[item.Index+offset])
offset++ offset++
} }
self.viewIndicesByModelIndex = viewIndicesByModelIndex
self.modelIndicesByViewIndex = modelIndicesByViewIndex
} }
func (self *ListRenderer) insertNonModelItems( func (self *ListRenderer) insertNonModelItems(

8
pkg/gui/context/local_commits_context.go
View File

@ -223,7 +223,7 @@ func (self *LocalCommitsContext) RefForAdjustingLineNumberInDiff() string {
} }
func (self *LocalCommitsContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition { func (self *LocalCommitsContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition {
return searchModelCommits(caseSensitive, self.GetCommits(), self.ColumnPositions(), searchStr) return searchModelCommits(caseSensitive, self.GetCommits(), self.ColumnPositions(), self.ModelIndexToViewIndex, searchStr)
} }
func (self *LocalCommitsViewModel) SetLimitCommits(value bool) { func (self *LocalCommitsViewModel) SetLimitCommits(value bool) {
@ -266,7 +266,9 @@ func shouldShowGraph(c *ContextCommon) bool {
return false return false
} }
func searchModelCommits(caseSensitive bool, commits []*models.Commit, columnPositions []int, searchStr string) []gocui.SearchPosition { func searchModelCommits(caseSensitive bool, commits []*models.Commit, columnPositions []int,
modelToViewIndex func(int) int, searchStr string,
) []gocui.SearchPosition {
if columnPositions == nil { if columnPositions == nil {
// This should never happen. We are being called at a time where our // This should never happen. We are being called at a time where our
// entire view content is scrolled out of view, so that we didn't draw // entire view content is scrolled out of view, so that we didn't draw
@ -283,7 +285,7 @@ func searchModelCommits(caseSensitive bool, commits []*models.Commit, columnPosi
// searching for a commit hash that is longer than the truncated hash // searching for a commit hash that is longer than the truncated hash
// that we render. So we just set the XStart and XEnd values to the // that we render. So we just set the XStart and XEnd values to the
// start and end of the commit hash column, which is the second one. // start and end of the commit hash column, which is the second one.
result := gocui.SearchPosition{XStart: columnPositions[1], XEnd: columnPositions[2] - 1, Y: idx} result := gocui.SearchPosition{XStart: columnPositions[1], XEnd: columnPositions[2] - 1, Y: modelToViewIndex(idx)}
return result, strings.Contains(normalize(commit.Hash()), searchStr) || return result, strings.Contains(normalize(commit.Hash()), searchStr) ||
strings.Contains(normalize(commit.Name), searchStr) || strings.Contains(normalize(commit.Name), searchStr) ||
strings.Contains(normalize(commit.ExtraInfo), searchStr) // allow searching for tags strings.Contains(normalize(commit.ExtraInfo), searchStr) // allow searching for tags

2
pkg/gui/context/sub_commits_context.go
View File

@ -225,7 +225,7 @@ func (self *SubCommitsContext) RefForAdjustingLineNumberInDiff() string {
} }
func (self *SubCommitsContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition { func (self *SubCommitsContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition {
return searchModelCommits(caseSensitive, self.GetCommits(), self.ColumnPositions(), searchStr) return searchModelCommits(caseSensitive, self.GetCommits(), self.ColumnPositions(), self.ModelIndexToViewIndex, searchStr)
} }
func (self *SubCommitsContext) IndexForGotoBottom() int { func (self *SubCommitsContext) IndexForGotoBottom() int {