Merge pull request #82 from reeflective/dev

dev

Author: maxlandon

completions.go

@@ -40,7 +40,11 @@ type Completions struct {
 func CompleteValues(values ...string) Completions {
 	vals := make([]Completion, 0, len(values))
 	for _, val := range values {
-		vals = append(vals, Completion{Value: val, Display: val, Description: ""})
+		vals = append(vals, Completion{
+			Value:       val,
+			Display:     val,
+			Description: "",
+		})
 	}
 
 	return Completions{values: vals}
@@ -54,7 +58,12 @@ func CompleteStyledValues(values ...string) Completions {
 
 	vals := make([]Completion, 0, len(values)/2)
 	for i := 0; i < len(values); i += 2 {
-		vals = append(vals, Completion{Value: values[i], Display: values[i], Description: "", Style: values[i+1]})
+		vals = append(vals, Completion{
+			Value:       values[i],
+			Display:     values[i],
+			Description: "",
+			Style:       values[i+1],
+		})
 	}
 
 	return Completions{values: vals}
@@ -68,7 +77,11 @@ func CompleteValuesDescribed(values ...string) Completions {
 
 	vals := make([]Completion, 0, len(values)/2)
 	for i := 0; i < len(values); i += 2 {
-		vals = append(vals, Completion{Value: values[i], Display: values[i], Description: values[i+1]})
+		vals = append(vals, Completion{
+			Value:       values[i],
+			Display:     values[i],
+			Description: values[i+1],
+		})
 	}
 
 	return Completions{values: vals}
@@ -82,7 +95,12 @@ func CompleteStyledValuesDescribed(values ...string) Completions {
 
 	vals := make([]Completion, 0, len(values)/3)
 	for i := 0; i < len(values); i += 3 {
-		vals = append(vals, Completion{Value: values[i], Display: values[i], Description: values[i+1], Style: values[i+2]})
+		vals = append(vals, Completion{
+			Value:       values[i],
+			Display:     values[i],
+			Description: values[i+1],
+			Style:       values[i+2],
+		})
 	}
 
 	return Completions{values: vals}

internal/completion/display.go

@@ -108,12 +108,12 @@ func (e *Engine) highlightDisplay(grp *group, val Candidate, pad, col int, selec
 		return padSpace(pad)
 	}
 
-	reset := color.Fmt(val.Style)
+	style := color.Fmt(val.Style)
 	candidate, padded := grp.trimDisplay(val, pad, col)
 
 	if e.IsearchRegex != nil && e.isearchBuf.Len() > 0 && !selected {
 		match := e.IsearchRegex.FindString(candidate)
-		match = color.Fmt(color.Bg+"244") + match + color.Reset + reset
+		match = color.Fmt(color.Bg+"244") + match + color.Reset + style
 		candidate = e.IsearchRegex.ReplaceAllLiteralString(candidate, match)
 	}
 
@@ -130,12 +130,12 @@ func (e *Engine) highlightDisplay(grp *group, val Candidate, pad, col int, selec
 		// Highlight the prefix if any and configured for it.
 		if e.config.GetBool("colored-completion-prefix") && e.prefix != "" {
 			if prefixMatch, err := regexp.Compile("^" + e.prefix); err == nil {
-				prefixColored := color.Bold + color.FgBlue + e.prefix + color.BoldReset + color.FgDefault + reset
+				prefixColored := color.Bold + color.FgBlue + e.prefix + color.BoldReset + color.FgDefault + style
 				candidate = prefixMatch.ReplaceAllString(candidate, prefixColored)
 			}
 		}
 
-		candidate = reset + candidate + color.Reset
+		candidate = style + candidate + color.Reset
 	}
 
 	return candidate + padded

internal/completion/group.go

@@ -124,9 +124,7 @@ func (g *group) initCompletionsGrid(comps RawValues) {
 	}
 
 	pairLength := g.longestValueDescribed(comps)
-	if pairLength > g.termWidth {
-		pairLength = g.termWidth
-	}
+	pairLength = min(g.termWidth, pairLength)
 
 	maxColumns := g.termWidth / pairLength
 	if g.list || maxColumns < 0 {
@@ -144,9 +142,9 @@ func (g *group) initCompletionAliased(domains []Candidate) {
 	g.aliased = true
 
 	// Filter out all duplicates: group aliased completions together.
-	grid, descriptions := g.createDescribedRows(domains)
+	grid, _ := g.createDescribedRows(domains)
 	g.calculateMaxColumnWidths(grid)
-	g.wrapExcessAliases(grid, descriptions)
+	g.wrapExcessAliases(grid)
 
 	g.maxY = len(g.rows)
 	g.maxX = len(g.columnsWidth)
@@ -172,16 +170,14 @@ func (g *group) createDescribedRows(values []Candidate) ([][]Candidate, []string
 	// Sorting helps with easier grids.
 	for _, description := range uniqueDescriptions {
 		row := descriptionMap[description]
-		// slices.Sort(row)
-		// slices.Reverse(row)
 		rows = append(rows, row)
 	}
 
 	return rows, uniqueDescriptions
 }
 
 // Wraps all rows for which there are too many aliases to be displayed on a single one.
-func (g *group) wrapExcessAliases(grid [][]Candidate, descriptions []string) {
+func (g *group) wrapExcessAliases(grid [][]Candidate) {
 	breakeven := 0
 	maxColumns := len(g.columnsWidth)
 
@@ -356,10 +352,7 @@ func (g *group) trimDisplay(comp Candidate, pad, col int) (candidate, padded str
 	// Get the allowed length for this column.
 	// The display can never be longer than terminal width.
 	maxDisplayWidth := g.columnsWidth[col] + 1
-
-	if maxDisplayWidth > g.termWidth {
-		maxDisplayWidth = g.termWidth
-	}
+	maxDisplayWidth = min(g.termWidth, maxDisplayWidth)
 
 	val = sanitizer.Replace(val)
 
@@ -417,10 +410,7 @@ func (g *group) getPad(value Candidate, columnIndex int, desc bool) int {
 	// to the terminal size: we are not really sure
 	// of where offsets might be set in the code...
 	column := columns[columnIndex]
-	if column > g.termWidth-1 {
-		column = g.termWidth - 1
-	}
-
+	column = min(g.termWidth-1, column)
 	padding := column - valLen
 
 	if padding < 0 {
@@ -641,7 +631,7 @@ func createGrid(values []Candidate, rowCount, maxColumns int) [][]Candidate {
 
 	grid := make([][]Candidate, rowCount)
 
-	for i := 0; i < rowCount; i++ {
+	for i := range rowCount {
 		grid[i] = createRow(values, maxColumns, i)
 	}
 
@@ -651,10 +641,7 @@ func createGrid(values []Candidate, rowCount, maxColumns int) [][]Candidate {
 func createRow(domains []Candidate, maxColumns, rowIndex int) []Candidate {
 	rowStart := rowIndex * maxColumns
 	rowEnd := (rowIndex + 1) * maxColumns
-
-	if rowEnd > len(domains) {
-		rowEnd = len(domains)
-	}
+	rowEnd = min(len(domains), rowEnd)
 
 	return domains[rowStart:rowEnd]
 }

internal/keymap/completion.go

@@ -1,6 +1,10 @@
 package keymap
 
-import "github.com/reeflective/readline/inputrc"
+import (
+	"slices"
+
+	"github.com/reeflective/readline/inputrc"
+)
 
 // menuselectKeys are the default keymaps in menuselect mode.
 var menuselectKeys = map[string]inputrc.Bind{
@@ -115,11 +119,5 @@ func (m *Engine) restrictCommands(mode Mode, commands []string) map[string]input
 }
 
 func isValidCommand(widget string, commands []string) bool {
-	for _, isw := range commands {
-		if isw == widget {
-			return true
-		}
-	}
-
-	return false
+    return slices.Contains(commands, widget)
 }

internal/keymap/config.go

@@ -145,7 +145,7 @@ func printBindsReadable(commands []string, all map[string][]string) {
 		case len(commandBinds) > 5:
 			var firstBinds []string
 
-			for i := 0; i < 5; i++ {
+			for i := range 5 {
 				firstBinds = append(firstBinds, "\""+commandBinds[i]+"\"")
 			}
 

internal/keymap/dispatch.go

@@ -96,12 +96,6 @@ func MatchMain(eng *Engine) (bind inputrc.Bind, command func(), prefix bool) {
 	return bind, command, prefix
 }
 
-func (m *Engine) makeMatch(active, prefixed inputrc.Bind) (prefix bool) {
-	m.active = active
-	m.prefixed = prefixed
-	return m.prefixed.Action != ""
-}
-
 func (m *Engine) dispatchKeys(binds map[string]inputrc.Bind) (bind inputrc.Bind, prefix bool, read, matched []byte) {
 	// Support for Unicode: if the character is multi-byte (UTF-8), consume all its bytes
 	// and treat it as a single self-insert action. Note that we just peek the characters
@@ -270,6 +264,13 @@ func (m *Engine) handleEscape(main bool) (bind inputrc.Bind, cmd func(), pref bo
 	return bind, cmd, pref
 }
 
+// makeMatch populates currently used binds.
+func (m *Engine) makeMatch(active, prefixed inputrc.Bind) (prefix bool) {
+	m.active = active
+	m.prefixed = prefixed
+	return m.prefixed.Action != ""
+}
+
 func (m *Engine) isEscapeKey() bool {
 	keys := m.keys.Caller()
 	if len(keys) == 0 {

internal/ui/prompt.go

@@ -205,23 +205,23 @@ func (p *Prompt) MultilineColumnPrint() {
 	switch {
 	case numbered:
 		column := ""
-		for pos := 0; pos < p.line.Lines(); pos++ {
+		for pos := range p.line.Lines() {
 			column += fmt.Sprintf("\n\x1b[1;30m%d\x1b[0m", pos+2)
 		}
 
 		fmt.Print(column)
 
 	case len(custom) > 0:
 		column := ""
-		for pos := 0; pos < p.line.Lines(); pos++ {
+		for range p.line.Lines() {
 			column += fmt.Sprintf("\n%s\x1b[0m", custom)
 		}
 
 		fmt.Print(column)
 
 	case defaultCol:
 		column := ""
-		for pos := 0; pos < p.line.Lines(); pos++ {
+		for range p.line.Lines() {
 			column += "\n" + multilineColumnDefault
 		}