diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-09 11:34:10 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-09 12:23:13 +1100 |
| commit | e47ad846c4b6100aaff7013a3516d329bde19194 (patch) | |
| tree | ead7f3f0a911d7ee4f4f46640c2bf449a74e8e05 /pkg/gui/commit_files_panel.go | |
| parent | 8f68ac21293f1a0476802974817d9f87875f8743 (diff) | |
big golangci-lint cleanup
Diffstat (limited to 'pkg/gui/commit_files_panel.go')
| -rw-r--r-- | pkg/gui/commit_files_panel.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go index 5fa7a4683..cafc4f95b 100644 --- a/pkg/gui/commit_files_panel.go +++ b/pkg/gui/commit_files_panel.go @@ -36,16 +36,15 @@ func (gui *Gui) handleCommitFileSelect(g *gocui.Gui, v *gocui.View) error { commitFile := gui.getSelectedCommitFile(g) if commitFile == nil { - return gui.renderString(g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles")) + gui.renderString(g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles")) + return nil } if err := gui.refreshSecondaryPatchPanel(); err != nil { return err } - if err := gui.focusPoint(0, gui.State.Panels.CommitFiles.SelectedLine, len(gui.State.CommitFiles), v); err != nil { - return err - } + v.FocusPoint(0, gui.State.Panels.CommitFiles.SelectedLine) cmd := gui.OSCommand.ExecutableFromString( gui.GitCommand.ShowCommitFileCmdStr(commitFile.Sha, commitFile.Name, false), @@ -132,7 +131,8 @@ func (gui *Gui) handleToggleFileForPatch(g *gocui.Gui, v *gocui.View) error { commitFile := gui.getSelectedCommitFile(g) if commitFile == nil { - return gui.renderString(g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles")) + gui.renderString(g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles")) + return nil } toggleTheFile := func() error { @@ -187,7 +187,8 @@ func (gui *Gui) enterCommitFile(selectedLineIdx int) error { commitFile := gui.getSelectedCommitFile(gui.g) if commitFile == nil { - return gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles")) + gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles")) + return nil } enterTheFile := func(selectedLineIdx int) error { |