lexer fixes and improvements

atmos.yaml

@@ -323,10 +323,9 @@ settings:
     timestamps: false     # Show timestamps in logs
     colors: true          # Enable colored output
     unicode: true         # Use unicode characters
-    
+
     syntax_highlighting:
       enabled: true
-      lexer: yaml           # Default lexer for the content
       formatter: terminal   # Output formatter (e.g., terminal, html)
       style: dracula        # Highlighting style
       pager: true           # Enable pager

internal/tui/templates/templater.go

@@ -132,8 +132,8 @@ func SetCustomUsageFunc(cmd *cobra.Command) error {
 	return nil
 }
 
-// getTerminalWidth returns the width of the terminal, defaulting to 80 if it cannot be determined
-func getTerminalWidth() int {
+// GetTerminalWidth returns the width of the terminal, defaulting to 80 if it cannot be determined
+func GetTerminalWidth() int {
 	defaultWidth := 80
 	screenWidth := defaultWidth
 
@@ -151,7 +151,7 @@ func getTerminalWidth() int {
 // WrappedFlagUsages formats the flag usage string to fit within the terminal width
 func WrappedFlagUsages(f *pflag.FlagSet) string {
 	var builder strings.Builder
-	width := getTerminalWidth()
+	width := GetTerminalWidth()
 	printer, err := NewHelpFlagPrinter(&builder, uint(width), f)
 	if err != nil {
 		// If we can't create the printer, return empty string

pkg/config/config.go

@@ -13,6 +13,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 
+	"github.com/cloudposse/atmos/internal/tui/templates"
 	"github.com/cloudposse/atmos/pkg/schema"
 	u "github.com/cloudposse/atmos/pkg/utils"
 	"github.com/cloudposse/atmos/pkg/version"
@@ -54,20 +55,20 @@ var (
 			},
 		},
 		Settings: schema.AtmosSettings{
+			ListMergeStrategy: "replace",
 			Terminal: schema.Terminal{
-				MaxWidth: 180,
+				MaxWidth: templates.GetTerminalWidth(),
 				Pager:    true,
 				Colors:   true,
 				Unicode:  true,
 				SyntaxHighlighting: schema.SyntaxHighlighting{
 					Enabled:   true,
-					Lexer:     "yaml",
-					Formatter: "terminal256",
-					Style:     "monokai",
+					Formatter: "terminal",
+					Style:     "dracula",
 					Pager:     true,
 					Options: schema.HighlightOptions{
 						LineNumbers: true,
-						Wrap:        true,
+						Wrap:        false,
 					},
 				},
 			},

pkg/utils/highlight_utils.go

@@ -4,12 +4,14 @@ import (
 	"bytes"
 	"io"
 	"os"
+	"strings"
 
 	"github.com/alecthomas/chroma"
 	"github.com/alecthomas/chroma/formatters"
 	"github.com/alecthomas/chroma/lexers"
 	"github.com/alecthomas/chroma/quick"
 	"github.com/alecthomas/chroma/styles"
+	"github.com/cloudposse/atmos/internal/tui/templates"
 	"github.com/cloudposse/atmos/pkg/schema"
 	"golang.org/x/term"
 )
@@ -18,11 +20,11 @@ import (
 func DefaultHighlightSettings() *schema.SyntaxHighlighting {
 	return &schema.SyntaxHighlighting{
 		Enabled:   true,
-		Lexer:     "yaml",
 		Formatter: "terminal",
 		Style:     "dracula",
+		Pager:     true,
 		Options: schema.HighlightOptions{
-			LineNumbers: false,
+			LineNumbers: true,
 			Wrap:        false,
 		},
 	}
@@ -39,9 +41,6 @@ func GetHighlightSettings(config schema.AtmosConfiguration) *schema.SyntaxHighli
 	if !settings.Enabled {
 		settings.Enabled = defaults.Enabled
 	}
-	if settings.Lexer == "" {
-		settings.Lexer = defaults.Lexer
-	}
 	if settings.Formatter == "" {
 		settings.Formatter = defaults.Formatter
 	}
@@ -76,8 +75,20 @@ func HighlightCodeWithConfig(code string, config schema.AtmosConfiguration) (str
 	if !settings.Enabled {
 		return code, nil
 	}
+
+	// Get terminal width
+	config.Settings.Terminal.MaxWidth = templates.GetTerminalWidth()
+
+	// Determine lexer based on content format
+	var lexerName string
+	if strings.HasPrefix(strings.TrimSpace(code), "{") {
+		lexerName = "json"
+	} else {
+		lexerName = "yaml"
+	}
+
 	// Get lexer
-	lexer := lexers.Get(settings.Lexer)
+	lexer := lexers.Get(lexerName)
 	if lexer == nil {
 		lexer = lexers.Fallback
 	}