better handling of clearing the search

jermainlaforce · Feb 24, 2020 · 78b62be · 78b62be
1 parent 1f5ccab
commit 78b62be
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go
@@ -400,7 +400,7 @@ func (gui *Gui) onBranchesTabClick(tabIndex int) error {
 func (gui *Gui) switchBranchesPanelContext(context string) error {
 	branchesView := gui.getBranchesView()
 	branchesView.Context = context
-	branchesView.ClearSearch()
+	gui.onSearchEscape()
 
 	contextTabIndexMap := map[string]int{
 		"local-branches":  0,

diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go
@@ -623,7 +623,7 @@ func (gui *Gui) onCommitsTabClick(tabIndex int) error {
 func (gui *Gui) switchCommitsPanelContext(context string) error {
 	commitsView := gui.getCommitsView()
 	commitsView.Context = context
-	commitsView.ClearSearch()
+	gui.onSearchEscape()
 
 	contextTabIndexMap := map[string]int{
 		"branch-commits": 0,

diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
@@ -346,8 +346,7 @@ func (gui *Gui) onFocusLost(v *gocui.View, newView *gocui.View) error {
 		return nil
 	}
 	if v.IsSearching() && newView.Name() != "search" {
-		gui.State.Searching.isSearching = false
-		v.ClearSearch()
+		gui.onSearchEscape()
 	}
 	switch v.Name() {
 	case "branches":

diff --git a/pkg/gui/searching.go b/pkg/gui/searching.go
@@ -72,7 +72,11 @@ func (gui *Gui) onSelectItemWrapper(innerFunc func(int) error) func(int, int, in
 
 func (gui *Gui) onSearchEscape() error {
 	gui.State.Searching.isSearching = false
-	gui.State.Searching.view = nil
+	if gui.State.Searching.view != nil {
+		gui.State.Searching.view.ClearSearch()
+		gui.State.Searching.view = nil
+	}
+
 	return nil
 }
 
@@ -81,9 +85,7 @@ func (gui *Gui) handleSearchEscape(g *gocui.Gui, v *gocui.View) error {
 		return err
 	}
 
-	if err := gui.onSearchEscape(); err != nil {
-		return err
-	}
+	gui.onSearchEscape()
 
 	return nil
 }