Skip to content

Commit

Permalink
Validate lineIndex in RenderHelpBar for the diff view
Browse files Browse the repository at this point in the history
Fixes #29
  • Loading branch information
rgburke committed Feb 2, 2018
1 parent a30318d commit 5d8a501
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions cmd/grv/diff_view.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func (diffView *DiffView) renderEmptyView(win RenderWindow) (err error) {
return
}

// RenderHelpBar does nothing
// RenderHelpBar renders help information for the diff view
func (diffView *DiffView) RenderHelpBar(lineBuilder *LineBuilder) (err error) {
diffView.lock.Lock()
defer diffView.lock.Unlock()
Expand All @@ -274,12 +274,15 @@ func (diffView *DiffView) RenderHelpBar(lineBuilder *LineBuilder) (err error) {
}

lineIndex := diffView.viewPos.ActiveRowIndex()
line := diffLines.lines[lineIndex]

if line.lineType == dltDiffStatsFile {
RenderKeyBindingHelp(diffView.ViewID(), lineBuilder, []ActionMessage{
{action: ActionSelect, message: "Jump to file diff"},
})
if lineIndex < uint(len(diffLines.lines)) {
line := diffLines.lines[lineIndex]

if line.lineType == dltDiffStatsFile {
RenderKeyBindingHelp(diffView.ViewID(), lineBuilder, []ActionMessage{
{action: ActionSelect, message: "Jump to file diff"},
})
}
}

return
Expand Down

0 comments on commit 5d8a501

Please sign in to comment.