fix lint / test

Author: f

pkg/jsonutils/jsonutils.go

@@ -111,7 +111,7 @@ func formatTable(data any) (string, error) {
 	return formatGenericMap(mapVal)
 }
 
-// formatToolsList formats a list of tools as a table
+// formatToolsList formats a list of tools as a table.
 func formatToolsList(tools any) (string, error) {
 	toolsSlice, ok := tools.([]any)
 	if !ok {
@@ -129,9 +129,9 @@ func formatToolsList(tools any) (string, error) {
 	fmt.Fprintln(w, "----\t-----------")
 
 	termWidth := getTermWidth()
-	nameColWidth := 20        // Default name column width
+	nameColWidth := 20                           // Default name column width
 	descColWidth := termWidth - nameColWidth - 5 // Leave some margin
-	
+
 	if descColWidth < 10 {
 		descColWidth = 40 // Minimum width if terminal is too narrow
 	}
@@ -147,20 +147,20 @@ func formatToolsList(tools any) (string, error) {
 
 		// Handle multiline description
 		lines := wrapText(desc, descColWidth)
-		
+
 		if len(lines) == 0 {
 			fmt.Fprintf(w, "%s\t\n", name)
 			continue
 		}
-		
+
 		// First line with name
 		fmt.Fprintf(w, "%s\t%s\n", name, lines[0])
-		
+
 		// Remaining lines with empty name column
 		for _, line := range lines[1:] {
 			fmt.Fprintf(w, "\t%s\n", line)
 		}
-		
+
 		// Add a blank line between entries
 		if len(lines) > 1 {
 			fmt.Fprintln(w, "\t")
@@ -171,7 +171,7 @@ func formatToolsList(tools any) (string, error) {
 	return buf.String(), nil
 }
 
-// getTermWidth returns the terminal width or a default value if detection fails
+// getTermWidth returns the terminal width or a default value if detection fails.
 func getTermWidth() int {
 	width, _, err := term.GetSize(int(os.Stdout.Fd()))
 	if err != nil || width <= 0 {
@@ -180,42 +180,42 @@ func getTermWidth() int {
 	return width
 }
 
-// wrapText wraps text to fit within a specified width
+// wrapText wraps text to fit within a specified width.
 func wrapText(text string, width int) []string {
 	if text == "" {
 		return []string{}
 	}
-	
+
 	words := strings.Fields(text)
 	if len(words) == 0 {
 		return []string{}
 	}
-	
+
 	var lines []string
 	var currentLine string
-	
+
 	for _, word := range words {
-		// Check if adding this word would exceed the width
-		if len(currentLine)+len(word)+1 > width && len(currentLine) > 0 {
+		switch {
+		case len(currentLine) == 0:
+			currentLine = word
+		case len(currentLine)+len(word)+1 > width:
 			// Add current line to lines and start a new line
 			lines = append(lines, currentLine)
 			currentLine = word
-		} else if len(currentLine) == 0 {
-			currentLine = word
-		} else {
+		default:
 			currentLine += " " + word
 		}
 	}
-	
+
 	// Add the last line
 	if len(currentLine) > 0 {
 		lines = append(lines, currentLine)
 	}
-	
+
 	return lines
 }
 
-// formatResourcesList formats a list of resources as a table
+// formatResourcesList formats a list of resources as a table.
 func formatResourcesList(resources any) (string, error) {
 	resourcesSlice, ok := resources.([]any)
 	if !ok {
@@ -241,7 +241,7 @@ func formatResourcesList(resources any) (string, error) {
 		name, _ := resource["name"].(string)
 		resType, _ := resource["type"].(string)
 		uri, _ := resource["uri"].(string)
-		
+
 		// Use the entire URI instead of truncating
 		fmt.Fprintf(w, "%s\t%s\t%s\n", name, resType, uri)
 	}
@@ -250,7 +250,7 @@ func formatResourcesList(resources any) (string, error) {
 	return buf.String(), nil
 }
 
-// formatPromptsList formats a list of prompts as a table
+// formatPromptsList formats a list of prompts as a table.
 func formatPromptsList(prompts any) (string, error) {
 	promptsSlice, ok := prompts.([]any)
 	if !ok {
@@ -268,9 +268,9 @@ func formatPromptsList(prompts any) (string, error) {
 	fmt.Fprintln(w, "----\t-----------")
 
 	termWidth := getTermWidth()
-	nameColWidth := 20        // Default name column width
+	nameColWidth := 20                           // Default name column width
 	descColWidth := termWidth - nameColWidth - 5 // Leave some margin
-	
+
 	if descColWidth < 10 {
 		descColWidth = 40 // Minimum width if terminal is too narrow
 	}
@@ -286,20 +286,20 @@ func formatPromptsList(prompts any) (string, error) {
 
 		// Handle multiline description
 		lines := wrapText(desc, descColWidth)
-		
+
 		if len(lines) == 0 {
 			fmt.Fprintf(w, "%s\t\n", name)
 			continue
 		}
-		
+
 		// First line with name
 		fmt.Fprintf(w, "%s\t%s\n", name, lines[0])
-		
+
 		// Remaining lines with empty name column
 		for _, line := range lines[1:] {
 			fmt.Fprintf(w, "\t%s\n", line)
 		}
-		
+
 		// Add a blank line between entries
 		if len(lines) > 1 {
 			fmt.Fprintln(w, "\t")

pkg/jsonutils/jsonutils_test.go

@@ -1,17 +1,17 @@
 package jsonutils
 
 import (
+	"os"
 	"strings"
 	"testing"
-	"os"
 )
 
-// TestWrapText tests the text wrapping functionality
+// TestWrapText tests the text wrapping functionality.
 func TestWrapText(t *testing.T) {
 	testCases := []struct {
 		name     string
-		text     string
 		width    int
+		text     string
 		expected []string
 	}{
 		{
@@ -43,11 +43,11 @@ func TestWrapText(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			result := wrapText(tc.text, tc.width)
-			
+
 			if len(result) != len(tc.expected) {
 				t.Fatalf("Expected %d lines, got %d", len(tc.expected), len(result))
 			}
-			
+
 			for i, line := range result {
 				if line != tc.expected[i] {
 					t.Errorf("Line %d: expected '%s', got '%s'", i, tc.expected[i], line)
@@ -57,25 +57,27 @@ func TestWrapText(t *testing.T) {
 	}
 }
 
-// TestGetTermWidth tests the terminal width detection
+// TestGetTermWidth tests the terminal width detection.
 func TestGetTermWidth(t *testing.T) {
 	// Save original stdout and restore it after the test
 	origStdout := os.Stdout
 	defer func() { os.Stdout = origStdout }()
-	
+
 	// Non-terminal case should return default width
 	r, w, _ := os.Pipe()
 	os.Stdout = w
-	
+
 	width := getTermWidth()
-	
+
 	// Close pipe
-	w.Close()
+	if err := w.Close(); err != nil {
+		t.Errorf("Error closing pipe: %v", err)
+	}
 	os.Stdout = origStdout
-	
+
 	// Read and discard pipe content
 	_, _ = r.Read(make([]byte, 1024))
-	
+
 	// Should return default width for non-terminal
 	if width != 80 {
 		t.Errorf("Expected default width 80 for non-terminal, got %d", width)
@@ -190,14 +192,14 @@ func TestParseFormat(t *testing.T) {
 	}
 }
 
-// TestToolsListFormatting tests the table formatting for tools list
+// TestToolsListFormatting tests the table formatting for tools list.
 func TestToolsListFormatting(t *testing.T) {
-	tools := []map[string]any{
-		{
+	tools := []any{
+		map[string]any{
 			"name":        "tool1",
 			"description": "This is a short description",
 		},
-		{
+		map[string]any{
 			"name":        "tool2",
 			"description": "This is a longer description that should wrap across multiple lines in the table output when displayed to the user",
 		},