Reuse logic from lint command inside the dev command

Author: Bruce Hill

pkg/cmd/dev.go

@@ -359,32 +359,12 @@ func runPreview(ctx context.Context, cmd *cli.Command) error {
 
 	// Phase 3: Start build and monitor progress in a loop
 	for {
-		// Keep checking diagnostics until they're all fixed
-		for {
-			diagnostics, err := getDiagnostics(ctx, cmd, cc)
-			if err != nil {
-				if errors.Is(err, ErrUserCancelled) {
-					return nil
-				}
-				return err
-			}
-
-			if len(diagnostics) > 0 {
-				fmt.Println(ViewDiagnosticsPrint(diagnostics, 10))
-			}
-
-			if hasBlockingDiagnostic(diagnostics) {
-				fmt.Println("\nDiagnostic checks will re-run once you edit your configuration files...")
-				if err := waitTillConfigChanges(ctx, cmd, cc); err != nil {
-					if errors.Is(err, ErrUserCancelled) {
-						return nil
-					}
-					return err
-				}
-				continue
-			} else {
-				break
+		// Make the user get past linter errors
+		if err := runLinter(ctx, cmd, true); err != nil {
+			if errors.Is(err, ErrUserCancelled) {
+				return nil
 			}
+			return err
 		}
 
 		// Start the build process

pkg/cmd/lint.go

@@ -39,23 +39,31 @@ var lintCommand = cli.Command{
 			Usage:   "Watch for files to change and re-run linting",
 		},
 	},
-	Action: runLinter,
+	Action: func(ctx context.Context, cmd *cli.Command) error {
+		if cmd.Bool("watch") {
+			// Clear the screen and move the cursor to the top
+			fmt.Print("\033[2J\033[H")
+			os.Stdout.Sync()
+		}
+		return runLinter(ctx, cmd, false)
+	},
 }
 
 var helpStyle = lipgloss.NewStyle().
 	Foreground(lipgloss.Color("241")).
 	Margin(1, 0, 0, 0)
 
 type lintModel struct {
-	spinner     spinner.Model
-	diagnostics []stainless.BuildDiagnostic
-	error       error
-	watching    bool
-	ctx         context.Context
-	cmd         *cli.Command
-	cc          *apiCommandContext
-	stopPolling chan struct{}
-	help        helpModel
+	spinner         spinner.Model
+	diagnostics     []stainless.BuildDiagnostic
+	error           error
+	watching        bool
+	stopWhenPassing bool
+	ctx             context.Context
+	cmd             *cli.Command
+	cc              *apiCommandContext
+	stopPolling     chan struct{}
+	help            helpModel
 }
 
 type helpModel struct {
@@ -64,18 +72,17 @@ type helpModel struct {
 }
 
 func (m lintModel) Init() tea.Cmd {
-	if m.watching {
-		// Clear the screen and move the cursor to the top
-		fmt.Print("\033[2J\033[H")
-		os.Stdout.Sync()
-	}
 	return m.spinner.Tick
 }
 
 func (m lintModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
 		if msg.String() == "ctrl+c" {
+			m.watching = false
+			m.error = ErrUserCancelled
+			return m, tea.Quit
+		} else if msg.String() == "enter" {
 			m.watching = false
 			return m, tea.Quit
 		}
@@ -87,6 +94,11 @@ func (m lintModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.cmd = msg.cmd
 		m.cc = msg.cc
 
+		if m.stopWhenPassing && !hasBlockingDiagnostic(m.diagnostics) {
+			m.watching = false
+			return m, tea.Quit
+		}
+
 		if m.watching {
 			return m, func() tea.Msg {
 				if err := waitTillConfigChanges(m.ctx, m.cmd, m.cc); err != nil {
@@ -130,8 +142,13 @@ func (m lintModel) View() string {
 		}
 	}
 
-	helpText := helpStyle.Render("Press Ctrl+C to exit")
-	return content + helpText
+	if m.stopWhenPassing {
+		content += helpStyle.Render("Press Enter to skip diagnostics, Ctrl+C to exit")
+	} else {
+		content += helpStyle.Render("Press Ctrl+C to exit")
+	}
+
+	return content
 }
 
 type diagnosticsMsg struct {
@@ -155,21 +172,22 @@ func getDiagnosticsCmd(ctx context.Context, cmd *cli.Command, cc *apiCommandCont
 	}
 }
 
-func runLinter(ctx context.Context, cmd *cli.Command) error {
+func runLinter(ctx context.Context, cmd *cli.Command, stopWhenPassing bool) error {
 	cc := getAPICommandContext(cmd)
 
 	s := spinner.New()
 	s.Spinner = spinner.MiniDot
 	s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("208"))
 
 	m := lintModel{
-		spinner:     s,
-		watching:    cmd.Bool("watch"),
-		ctx:         ctx,
-		cmd:         cmd,
-		cc:          cc,
-		stopPolling: make(chan struct{}),
-		help:        helpModel{},
+		spinner:         s,
+		watching:        cmd.Bool("watch"),
+		stopWhenPassing: stopWhenPassing,
+		ctx:             ctx,
+		cmd:             cmd,
+		cc:              cc,
+		stopPolling:     make(chan struct{}),
+		help:            helpModel{},
 	}
 
 	p := tea.NewProgram(m, tea.WithContext(ctx))