Merge pull request #1 from nsumbadze/modernize/lazynpm

Modernize/lazynpm

Author: nsumbadze

pkg/config/app_config.go

@@ -240,6 +240,9 @@ func GetDefaultConfig() []byte {
       - blue
     selectedLineBgColor:
       - blue
+    selectedLineFgColor:
+      - white
+      - bold
 update:
   method: prompt # can be: prompt | background | never
   days: 14 # how often a update is checked for

pkg/gui/keybindings_test.go

@@ -6,6 +6,41 @@ import (
 	"github.com/jesseduffield/gocui"
 )
 
+func TestOptionsMapToString(t *testing.T) {
+	gui := &Gui{}
+
+	actual := gui.optionsMapToString(map[string]string{
+		"j/k": "navigate",
+		"?":   "menu",
+	})
+	expected := "[?] menu  •  [j/k] navigate"
+
+	if actual != expected {
+		t.Fatalf("optionsMapToString() = %q, want %q", actual, expected)
+	}
+}
+
+func TestFormatPanelTitle(t *testing.T) {
+	testCases := []struct {
+		name     string
+		focused  bool
+		expected string
+	}{
+		{name: "focused", focused: true, expected: "> 2 Packages"},
+		{name: "unfocused", focused: false, expected: "  2 Packages"},
+	}
+
+	for _, testCase := range testCases {
+		testCase := testCase
+		t.Run(testCase.name, func(t *testing.T) {
+			actual := formatPanelTitle(2, "Packages", testCase.focused)
+			if actual != testCase.expected {
+				t.Fatalf("formatPanelTitle() = %q, want %q", actual, testCase.expected)
+			}
+		})
+	}
+}
+
 func TestGetKeyDisplay(t *testing.T) {
 	testCases := []struct {
 		name     string

pkg/gui/layout.go

@@ -7,6 +7,13 @@ import (
 	"github.com/jesseduffield/lazynpm/pkg/utils"
 )
 
+// applyListHighlight keeps the focused row readable across all list panels.
+// gocui does not automatically use the configured theme value for selected rows.
+func (gui *Gui) applyListHighlight(view *gocui.View) {
+	view.SelBgColor = theme.SelectedLineBgColor
+	view.SelFgColor = theme.SelectedLineFgColor
+}
+
 // getFocusLayout returns a manager function for when view gain and lose focus
 func (gui *Gui) getFocusLayout() func(g *gocui.Gui) error {
 	var previousView *gocui.View
@@ -236,7 +243,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		if err.Error() != "unknown view" {
 			return err
 		}
-		v.Title = gui.Tr.SLocalize("StatusTitle")
+		v.Title = gui.panelTitle("status", 1, gui.Tr.SLocalize("StatusTitle"))
 		v.FgColor = textColor
 	}
 
@@ -246,39 +253,43 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			return err
 		}
 		packagesView.Highlight = true
-		packagesView.Title = gui.Tr.SLocalize("PackagesTitle")
+		packagesView.Title = gui.panelTitle("packages", 2, gui.Tr.SLocalize("PackagesTitle"))
 		packagesView.ContainsList = true
 	}
+	gui.applyListHighlight(packagesView)
 
 	depsView, err := g.SetViewBeneath("deps", "packages", vHeights["deps"])
 	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
-		depsView.Title = gui.Tr.SLocalize("DepsTitle")
+		depsView.Title = gui.panelTitle("deps", 3, gui.Tr.SLocalize("DepsTitle"))
 		depsView.FgColor = textColor
 		depsView.ContainsList = true
 	}
+	gui.applyListHighlight(depsView)
 
 	scriptsView, err := g.SetViewBeneath("scripts", "deps", vHeights["scripts"])
 	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
-		scriptsView.Title = gui.Tr.SLocalize("ScriptsTitle")
+		scriptsView.Title = gui.panelTitle("scripts", 4, gui.Tr.SLocalize("ScriptsTitle"))
 		scriptsView.FgColor = textColor
 		scriptsView.ContainsList = true
 	}
+	gui.applyListHighlight(scriptsView)
 
 	tarballsView, err := g.SetViewBeneath("tarballs", "scripts", vHeights["tarballs"])
 	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
-		tarballsView.Title = gui.Tr.SLocalize("TarballsTitle")
+		tarballsView.Title = gui.panelTitle("tarballs", 5, gui.Tr.SLocalize("TarballsTitle"))
 		tarballsView.FgColor = textColor
 		tarballsView.ContainsList = true
 	}
+	gui.applyListHighlight(tarballsView)
 	tarballsView.Visible = gui.showTarballsView()
 
 	if v, err := g.SetView("options", appStatusOptionsBoundary-1, height-2, optionsVersionBoundary-1, height, 0); err != nil {

pkg/gui/menu_panel.go

@@ -78,6 +78,7 @@ func (gui *Gui) createMenu(title string, items []*menuItem, createMenuOptions cr
 	menuView.Title = title
 	menuView.FgColor = theme.GocuiDefaultTextColor
 	menuView.ContainsList = true
+	gui.applyListHighlight(menuView)
 	menuView.Clear()
 	fmt.Fprint(menuView, list)
 	gui.State.Panels.Menu.SelectedLine = 0

pkg/gui/view_helpers.go

@@ -200,10 +200,27 @@ func (gui *Gui) renderString(viewName, s string) {
 func (gui *Gui) optionsMapToString(optionsMap map[string]string) string {
 	optionsArray := make([]string, 0)
 	for key, description := range optionsMap {
-		optionsArray = append(optionsArray, key+": "+description)
+		optionsArray = append(optionsArray, fmt.Sprintf("[%s] %s", key, description))
 	}
 	sort.Strings(optionsArray)
-	return strings.Join(optionsArray, ", ")
+	return strings.Join(optionsArray, "  •  ")
+}
+
+func (gui *Gui) panelTitle(viewName string, number int, title string) string {
+	currentView := gui.g.CurrentView()
+	focused := currentView != nil && currentView.Name() == viewName
+	if currentView == nil {
+		focused = viewName == "packages"
+	}
+	return formatPanelTitle(number, title, focused)
+}
+
+func formatPanelTitle(number int, title string, focused bool) string {
+	marker := " "
+	if focused {
+		marker = ">"
+	}
+	return fmt.Sprintf("%s %d %s", marker, number, title)
 }
 
 func (gui *Gui) renderOptionsMap(optionsMap map[string]string) error {
@@ -328,12 +345,17 @@ func (gui *Gui) renderPanelOptions() error {
 }
 
 func (gui *Gui) renderGlobalOptions() error {
+	jumpRange := "1-4"
+	if gui.showTarballsView() {
+		jumpRange = "1-5"
+	}
+
 	return gui.renderOptionsMap(map[string]string{
 		fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.scrollUpMain"), gui.getKeyDisplay("universal.scrollDownMain")):                                                                                 gui.Tr.SLocalize("scroll"),
 		fmt.Sprintf("%s %s %s %s", gui.getKeyDisplay("universal.prevBlock"), gui.getKeyDisplay("universal.nextBlock"), gui.getKeyDisplay("universal.prevItem"), gui.getKeyDisplay("universal.nextItem")): gui.Tr.SLocalize("navigate"),
 		fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.return"), gui.getKeyDisplay("universal.quit")):                                                                                                 gui.Tr.SLocalize("close"),
 		gui.getKeyDisplay("universal.optionMenu"): gui.Tr.SLocalize("menu"),
-		"1-4": gui.Tr.SLocalize("jump"),
+		jumpRange: gui.Tr.SLocalize("jump"),
 	})
 }
 

pkg/theme/theme.go

@@ -22,7 +22,9 @@ var (
 	InactiveBorderColor gocui.Attribute
 
 	// SelectedLineBgColor is the background color for the selected line
-	SelectedLineBgColor color.Attribute
+	SelectedLineBgColor gocui.Attribute
+	// SelectedLineFgColor is the foreground color for the selected line
+	SelectedLineFgColor gocui.Attribute
 
 	OptionsFgColor color.Attribute
 
@@ -35,7 +37,12 @@ var (
 func UpdateTheme(userConfig *viper.Viper) {
 	ActiveBorderColor = GetGocuiColor(userConfig.GetStringSlice("gui.theme.activeBorderColor"))
 	InactiveBorderColor = GetGocuiColor(userConfig.GetStringSlice("gui.theme.inactiveBorderColor"))
-	SelectedLineBgColor = GetBgColor(userConfig.GetStringSlice("gui.theme.selectedLineBgColor"))
+	SelectedLineBgColor = GetGocuiBgColor(userConfig.GetStringSlice("gui.theme.selectedLineBgColor"))
+	selectedLineFgColor := userConfig.GetStringSlice("gui.theme.selectedLineFgColor")
+	if len(selectedLineFgColor) == 0 {
+		selectedLineFgColor = []string{"white", "bold"}
+	}
+	SelectedLineFgColor = GetGocuiColor(selectedLineFgColor)
 	OptionsColor = GetGocuiColor(userConfig.GetStringSlice("gui.theme.optionsTextColor"))
 	OptionsFgColor = GetFgColor(userConfig.GetStringSlice("gui.theme.optionsTextColor"))
 
@@ -129,6 +136,29 @@ func GetGocuiColor(keys []string) gocui.Attribute {
 	return attribute
 }
 
+// GetGocuiBgColor converts configured background colors to gocui attributes.
+func GetGocuiBgColor(keys []string) gocui.Attribute {
+	colorMap := map[string]gocui.Attribute{
+		"default": gocui.ColorDefault,
+		"black":   gocui.ColorBlack,
+		"red":     gocui.ColorRed,
+		"green":   gocui.ColorGreen,
+		"yellow":  gocui.ColorYellow,
+		"blue":    gocui.ColorBlue,
+		"magenta": gocui.ColorMagenta,
+		"cyan":    gocui.ColorCyan,
+		"white":   gocui.ColorWhite,
+		"bold":    gocui.AttrBold,
+	}
+	var attribute gocui.Attribute
+	for _, key := range keys {
+		if value, present := colorMap[key]; present {
+			attribute |= value
+		}
+	}
+	return attribute
+}
+
 // GetColor bitwise OR's a list of attributes obtained via the given keys
 func GetBgColor(keys []string) color.Attribute {
 	var attribute color.Attribute