diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-20 08:53:10 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | 146722beb875d6f44a9d05b289e1cf92e8518932 (patch) | |
| tree | 2694b571bcce5d1e2a1fa83815abd8d4682894aa /pkg/gui/commit_files_panel.go | |
| parent | eb5e54e9fd649e556d8c639ff87fedbfe02ff8e9 (diff) | |
rename to SelectedLineIdx
Diffstat (limited to 'pkg/gui/commit_files_panel.go')
| -rw-r--r-- | pkg/gui/commit_files_panel.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go index f09201f55..149114d5b 100644 --- a/pkg/gui/commit_files_panel.go +++ b/pkg/gui/commit_files_panel.go @@ -7,7 +7,7 @@ import ( ) func (gui *Gui) getSelectedCommitFile() *commands.CommitFile { - selectedLine := gui.State.Panels.CommitFiles.SelectedLine + selectedLine := gui.State.Panels.CommitFiles.SelectedLineIdx if selectedLine == -1 { return nil } @@ -44,7 +44,7 @@ func (gui *Gui) handleSwitchToCommitsPanel(g *gocui.Gui, v *gocui.View) error { } func (gui *Gui) handleCheckoutCommitFile(g *gocui.Gui, v *gocui.View) error { - file := gui.State.CommitFiles[gui.State.Panels.CommitFiles.SelectedLine] + file := gui.State.CommitFiles[gui.State.Panels.CommitFiles.SelectedLineIdx] if err := gui.GitCommand.CheckoutFile(file.Sha, file.Name); err != nil { return gui.surfaceError(err) @@ -58,7 +58,7 @@ func (gui *Gui) handleDiscardOldFileChange(g *gocui.Gui, v *gocui.View) error { return err } - fileName := gui.State.CommitFiles[gui.State.Panels.CommitFiles.SelectedLine].Name + fileName := gui.State.CommitFiles[gui.State.Panels.CommitFiles.SelectedLineIdx].Name return gui.ask(askOpts{ returnToView: v, @@ -67,7 +67,7 @@ func (gui *Gui) handleDiscardOldFileChange(g *gocui.Gui, v *gocui.View) error { prompt: gui.Tr.SLocalize("DiscardFileChangesPrompt"), handleConfirm: func() error { return gui.WithWaitingStatus(gui.Tr.SLocalize("RebasingStatus"), func() error { - if err := gui.GitCommand.DiscardOldFileChanges(gui.State.Commits, gui.State.Panels.Commits.SelectedLine, fileName); err != nil { + if err := gui.GitCommand.DiscardOldFileChanges(gui.State.Commits, gui.State.Panels.Commits.SelectedLineIdx, fileName); err != nil { if err := gui.handleGenericMergeCommandResult(err); err != nil { return err } |