feat: brings back support to print syntax highlighted commands prior to their execution

Author: nxtcoder17

go.mod

@@ -3,6 +3,8 @@ module github.com/nxtcoder17/runfile
 go 1.24
 
 require (
+	github.com/alecthomas/chroma/v2 v2.15.0
+	github.com/charmbracelet/lipgloss v1.0.0
 	github.com/joho/godotenv v1.5.1
 	github.com/muesli/termenv v0.15.2
 	github.com/nxtcoder17/fwatcher v1.2.0
@@ -14,6 +16,8 @@ require (
 
 require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/charmbracelet/x/ansi v0.4.2 // indirect
+	github.com/dlclark/regexp2 v1.11.4 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect

go.sum

@@ -1,14 +1,28 @@
+github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
+github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
+github.com/alecthomas/chroma/v2 v2.15.0 h1:LxXTQHFoYrstG2nnV9y2X5O94sOBzf0CIUpSTbpxvMc=
+github.com/alecthomas/chroma/v2 v2.15.0/go.mod h1:gUhVLrPDXPtp/f+L1jo9xepo9gL4eLwRuGAunSZMkio=
+github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
+github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
+github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
+github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
+github.com/charmbracelet/x/ansi v0.4.2 h1:0JM6Aj/g/KC154/gOP4vfxun0ff6itogDYk41kof+qk=
+github.com/charmbracelet/x/ansi v0.4.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
+github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
 github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
+github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
@@ -23,8 +37,6 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
 github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
-github.com/nxtcoder17/fwatcher v1.1.0 h1:boRQ1zyN7SDnRYqrEUMJTKpf/j3sQ3YMY0FQKkUIQ0o=
-github.com/nxtcoder17/fwatcher v1.1.0/go.mod h1:50dOLE7lHu6bwGtBM7lZ5m6b8wKKMUZDPgBKM2pgdEA=
 github.com/nxtcoder17/fwatcher v1.2.0 h1:Nn5NQZrd6tnY0aFIUmpHCysLDbIsUYn4oyHaxEaVj60=
 github.com/nxtcoder17/fwatcher v1.2.0/go.mod h1:SMwIdCpyi5fBygrkCX8hIIUeILzgoxJFaDSlhFBOWWQ=
 github.com/nxtcoder17/go.pkgs v0.0.0-20250216034729-39e2d2cd48da h1:Y6GILHFlrihVfDqDPQ98y2kdUeI0SQc8tnoXh2NbEIA=

runner/run-task.go

@@ -1,17 +1,18 @@
 package runner
 
 import (
-	// "bytes"
+	"bytes"
 	"context"
 	"fmt"
+	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 	"sync"
 
-	// "github.com/alecthomas/chroma/v2/quick"
-	// "github.com/charmbracelet/lipgloss"
+	"github.com/alecthomas/chroma/v2/quick"
+	"github.com/charmbracelet/lipgloss"
 	"github.com/muesli/termenv"
 	"github.com/nxtcoder17/fwatcher/pkg/executor"
 	"github.com/nxtcoder17/fwatcher/pkg/watcher"
@@ -53,6 +54,35 @@ func isTTY() bool {
 	return ((stdout.Mode() & os.ModeCharDevice) == os.ModeCharDevice) && ((stderr.Mode() & os.ModeCharDevice) == os.ModeCharDevice)
 }
 
+func printCommand(writer io.Writer, prefix, lang, cmd string) {
+	if isTTY() {
+		borderColor := "#4388cc"
+		if !isDarkTheme() {
+			borderColor = "#3d5485"
+		}
+		s := lipgloss.NewStyle().BorderForeground(lipgloss.Color(borderColor)).PaddingLeft(1).PaddingRight(1).Border(lipgloss.RoundedBorder(), true, true, true, true)
+		// labelStyle := lipgloss.NewStyle().Foreground(lipgloss.Color(borderColor)).Blink(true)
+
+		hlCode := new(bytes.Buffer)
+		// choose colorschemes from `https://swapoff.org/chroma/playground/`
+		colorscheme := "catppuccin-macchiato"
+		if !isDarkTheme() {
+			colorscheme = "monokailight"
+		}
+		_ = colorscheme
+		// quick.Highlight(hlCode, strings.TrimSpace(command.Command), "bash", "terminal16m", colorscheme)
+
+		cmdStr := strings.TrimSpace(cmd)
+
+		quick.Highlight(hlCode, cmdStr, lang, "terminal16m", colorscheme)
+		// cst := styles.Get("gruvbox")
+		// fmt.Println("cst: ", cst.Name, styles.Fallback.Name, styles.Names())
+
+		// fmt.Printf("%s\n", s.Render(args.taskName+" | "+hlCode.String()))
+		fmt.Fprintf(writer, "%s\n", s.Render(padString(hlCode.String(), prefix)))
+	}
+}
+
 type CreateCommandGroupArgs struct {
 	Runfile *types.ParsedRunfile
 	Task    *types.ParsedTask
@@ -104,6 +134,15 @@ func createCommandGroups(ctx Context, args CreateCommandGroupArgs) ([]executor.C
 				cg := executor.CommandGroup{Parallel: args.Task.Parallel}
 
 				cg.Commands = append(cg.Commands, func(c context.Context) *exec.Cmd {
+					commandsList := make([]string, 0, len(args.Task.Commands))
+					for _, c := range args.Task.Commands {
+						if c.Command != nil {
+							commandsList = append(commandsList, *c.Command)
+						}
+					}
+
+					printCommand(args.Stdout.WithPrefix(""), strings.Join(args.Trail, "/"), "bash", strings.Join(commandsList, "\n"))
+
 					return CreateCommand(ctx, CmdArgs{
 						Shell:       args.Task.Shell,
 						Env:         fn.ToEnviron(args.Task.Env),

runner/writer.go

@@ -9,8 +9,7 @@ import (
 )
 
 type LineWriter struct {
-	prefix string
-	w      io.Writer
+	w io.Writer
 }
 
 // Write implements io.Writer.
@@ -40,7 +39,7 @@ func (s *LogWriter) WithPrefix(prefix string) io.Writer {
 		defer s.wg.Done()
 		copyStream(prefix, s.w, pr)
 	}()
-	return &LineWriter{prefix: prefix, w: pw}
+	return &LineWriter{w: pw}
 }
 
 func (s *LogWriter) Wait() {
@@ -52,15 +51,18 @@ func copyStream(prefix string, dest io.Writer, src io.Reader) {
 	for {
 		b, err := r.ReadBytes('\n')
 		if err != nil {
-			fmt.Println("ERR: ", err)
 			if errors.Is(err, io.EOF) {
-				dest.Write([]byte(fmt.Sprintf("[%s] ", prefix)))
+				if prefix != "" {
+					dest.Write([]byte(fmt.Sprintf("[%s] ", prefix)))
+				}
 				dest.Write(b)
 				return
 			}
 		}
 
-		dest.Write([]byte(fmt.Sprintf("[%s] ", prefix)))
+		if prefix != "" {
+			dest.Write([]byte(fmt.Sprintf("[%s] ", prefix)))
+		}
 		dest.Write(b)
 	}
 }