more simult commands

jesseduffield · Apr 12, 2020 · 1a47dee · 1a47dee
1 parent fb86aa5
commit 1a47dee
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/pkg/gui/dependencies_panel.go b/pkg/gui/dependencies_panel.go
@@ -23,8 +23,8 @@ func (gui *Gui) getSelectedDependency() *commands.Dependency {
 func (gui *Gui) handleDepSelect(g *gocui.Gui, v *gocui.View) error {
 	dep := gui.getSelectedDependency()
 	if dep == nil {
-		gui.getMainView().Title = ""
-		return gui.newStringTask("main", gui.Tr.SLocalize("NoDependencies"))
+		gui.printToMain(gui.Tr.SLocalize("NoDependencies"))
+		return nil
 	}
 	if dep.PackageConfig != nil {
 		summary := presentation.PackageSummary(*dep.PackageConfig)
@@ -35,6 +35,7 @@ func (gui *Gui) handleDepSelect(g *gocui.Gui, v *gocui.View) error {
 	} else {
 		gui.renderString("secondary", "dependency not present in node_modules")
 	}
+	gui.activateContextView(gui.depContextKey(dep))
 	return nil
 }
 

diff --git a/pkg/gui/packages_panel.go b/pkg/gui/packages_panel.go
@@ -22,14 +22,19 @@ func (gui *Gui) getSelectedPackage() *commands.Package {
 	return gui.State.Packages[gui.State.Panels.Packages.SelectedLine]
 }
 
-func (gui *Gui) bringContextViewToTop(viewName string) {
+func (gui *Gui) activateContextView(viewName string) {
 	if gui.State.ContextViews[viewName] == nil {
 		viewName = "main"
 		gui.getMainView().Clear()
 	}
 	_, _ = gui.g.SetViewOnTop(viewName)
 }
 
+func (gui *Gui) printToMain(str string) {
+	gui.renderString("main", str)
+	_, _ = gui.g.SetViewOnTop("main")
+}
+
 func (gui *Gui) handlePackageSelect(g *gocui.Gui, v *gocui.View) error {
 	pkg := gui.getSelectedPackage()
 	if pkg == nil {
@@ -38,7 +43,7 @@ func (gui *Gui) handlePackageSelect(g *gocui.Gui, v *gocui.View) error {
 	summary := presentation.PackageSummary(pkg.Config)
 	summary = fmt.Sprintf("%s\nPath: %s", summary, utils.ColoredString(pkg.Path, color.FgCyan))
 	gui.renderString("secondary", summary)
-	gui.bringContextViewToTop(gui.packageContextKey(pkg))
+	gui.activateContextView(gui.packageContextKey(pkg))
 	return nil
 }
 

diff --git a/pkg/gui/scripts_panel.go b/pkg/gui/scripts_panel.go
@@ -27,10 +27,11 @@ func (gui *Gui) getScripts() []*commands.Script {
 func (gui *Gui) handleScriptSelect(g *gocui.Gui, v *gocui.View) error {
 	script := gui.getSelectedScript()
 	if script == nil {
-		gui.getMainView().Title = ""
-		return gui.newStringTask("main", gui.Tr.SLocalize("NoScripts"))
+		gui.printToMain(gui.Tr.SLocalize("NoScripts"))
+		return nil
 	}
 	gui.renderString("secondary", presentation.ScriptSummary(script))
+	gui.activateContextView(gui.scriptContextKey(script))
 	return nil
 }
 

diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go
@@ -55,7 +55,8 @@ func (gui *Gui) handleStatusSelect(g *gocui.Gui, v *gocui.View) error {
 			magenta.Sprint("Become a sponsor (github is matching all donations for 12 months): https://github.com/sponsors/jesseduffield"), // caffeine ain't free
 		}, "\n\n")
 
-	return gui.newStringTask("main", dashboardString)
+	gui.printToMain(dashboardString)
+	return nil
 }
 
 func (gui *Gui) handleOpenConfig(g *gocui.Gui, v *gocui.View) error {

diff --git a/pkg/gui/tasks_adapter.go b/pkg/gui/tasks_adapter.go
@@ -2,11 +2,6 @@ package gui
 
 import "github.com/jesseduffield/lazynpm/pkg/theme"
 
-func (gui *Gui) newStringTask(viewName string, str string) error {
-	gui.renderString(viewName, str)
-	return nil
-}
-
 func (gui *Gui) newMainCommand(cmdStr string, contextKey string) error {
 	cmd := gui.OSCommand.ExecutableFromString(cmdStr)