diff --git a/packages/nx/package.json b/packages/nx/package.json index dadaf4cb7e..da76394540 100644 --- a/packages/nx/package.json +++ b/packages/nx/package.json @@ -69,6 +69,7 @@ "tree-kill": "^1.2.2", "tsconfig-paths": "catalog:typescript", "tslib": "catalog:typescript", + "why-is-node-running": "^3.2.2", "yaml": "^2.6.0", "yargs": "catalog:", "yargs-parser": "catalog:" @@ -170,8 +171,5 @@ "x86_64-unknown-linux-musl", "x86_64-unknown-freebsd" ] - }, - "devDependencies": { - "why-is-node-running": "^3.2.2" } } diff --git a/packages/nx/src/native/tui/app.rs b/packages/nx/src/native/tui/app.rs index 0938c8f978..aab560f049 100644 --- a/packages/nx/src/native/tui/app.rs +++ b/packages/nx/src/native/tui/app.rs @@ -3,6 +3,7 @@ use crossterm::event::{KeyCode, KeyEvent, KeyModifiers, MouseEvent, MouseEventKi use hashbrown::HashSet; use napi::bindgen_prelude::External; use napi::threadsafe_function::{ErrorStrategy, ThreadsafeFunction}; +use parking_lot::Mutex; use ratatui::layout::{Alignment, Constraint, Direction, Layout, Rect, Size}; use ratatui::style::Modifier; use ratatui::style::Style; @@ -10,7 +11,6 @@ use ratatui::text::{Line, Span}; use ratatui::widgets::{Block, Borders, Gauge, Paragraph}; use std::collections::HashMap; use std::io; -use parking_lot::Mutex; use std::sync::Arc; use tokio::sync::mpsc; use tokio::sync::mpsc::UnboundedSender; @@ -195,9 +195,7 @@ impl App { for (idx, task) in pinned_tasks.iter().enumerate() { if idx < 2 { - self.selection_manager - .lock() - .select_task(task.clone()); + self.selection_manager.lock().select_task(task.clone()); if pinned_tasks.len() == 1 && idx == 0 { self.display_and_focus_current_task_in_terminal_pane(match run_mode { @@ -366,12 +364,7 @@ impl App { } fn begin_exit_countdown(&mut self) { - let countdown_duration = self - .state - .lock() - .tui_config() - .auto_exit - .countdown_seconds(); + let countdown_duration = self.state.lock().tui_config().auto_exit.countdown_seconds(); // If countdown is disabled, exit immediately if countdown_duration.is_none() { self.quit(); @@ -590,18 +583,19 @@ impl App { if !tasks_list.filter_mode && key.code == KeyCode::Char('q') { // Check if all tasks are in a completed state using the task status map let state = self.state.lock(); - let all_tasks_completed = state.get_task_status_map().values().all(|status| { - matches!( - status, - TaskStatus::Success - | TaskStatus::Failure - | TaskStatus::Skipped - | TaskStatus::LocalCache - | TaskStatus::LocalCacheKeptExisting - | TaskStatus::RemoteCache - | TaskStatus::Stopped // Consider stopped continuous tasks as completed for exit purposes - ) - }); + let all_tasks_completed = + state.get_task_status_map().values().all(|status| { + matches!( + status, + TaskStatus::Success + | TaskStatus::Failure + | TaskStatus::Skipped + | TaskStatus::LocalCache + | TaskStatus::LocalCacheKeptExisting + | TaskStatus::RemoteCache + | TaskStatus::Stopped // Consider stopped continuous tasks as completed for exit purposes + ) + }); drop(state); if all_tasks_completed { @@ -922,15 +916,18 @@ impl App { } Action::Tick => { let state = self.state.lock(); - state.get_console_messenger().as_ref().and_then(|messenger| { - self.components - .iter() - .find_map(|c| c.as_any().downcast_ref::()) - .and_then(|tasks_list| { - let pty_instances = state.get_pty_instances(); - messenger.update_running_tasks(&tasks_list.tasks, &pty_instances) - }) - }); + state + .get_console_messenger() + .as_ref() + .and_then(|messenger| { + self.components + .iter() + .find_map(|c| c.as_any().downcast_ref::()) + .and_then(|tasks_list| { + let pty_instances = state.get_pty_instances(); + messenger.update_running_tasks(&tasks_list.tasks, &pty_instances) + }) + }); } // Quit immediately Action::Quit => { @@ -1094,9 +1091,8 @@ impl App { .collect(); // Calculate minimal view context once for all panes - let is_minimal = - self.is_task_list_hidden() - && get_task_count(self.state.lock().task_graph()) == 1; + let is_minimal = self.is_task_list_hidden() + && get_task_count(self.state.lock().task_graph()) == 1; for (pane_idx, pane_area, relevant_pane_task) in terminal_panes_data { if let Some(task_name) = relevant_pane_task { @@ -1250,11 +1246,7 @@ impl App { .set_task_list_visibility(TaskListVisibility::Visible); // Extract task name first to end the immutable borrow - let task_name = match self - .selection_manager - .lock() - .get_selected_task_name() - { + let task_name = match self.selection_manager.lock().get_selected_task_name() { Some(name) => name.clone(), None => return, }; @@ -1430,11 +1422,7 @@ impl App { fn assign_current_task_to_pane(&mut self, pane_idx: usize) { // Extract task name first to end the immutable borrow - let task_name = match self - .selection_manager - .lock() - .get_selected_task_name() - { + let task_name = match self.selection_manager.lock().get_selected_task_name() { Some(name) => name.clone(), None => return, }; @@ -1598,49 +1586,49 @@ impl App { fn handle_pty_resize(&mut self) -> io::Result<()> { // Always use fullscreen mode logic { - if self.layout_areas.is_none() { - return Ok(()); - } + if self.layout_areas.is_none() { + return Ok(()); + } - let mut needs_sort = false; + let mut needs_sort = false; - for (pane_idx, pane_area) in self - .layout_areas - .as_ref() - .unwrap() - .terminal_panes - .iter() - .enumerate() - { - let terminal_pane_data = &mut self.terminal_pane_data[pane_idx]; - if let Some(pty) = terminal_pane_data.pty.as_ref() { - let (pty_height, pty_width) = - TerminalPane::calculate_pty_dimensions(*pane_area); + for (pane_idx, pane_area) in self + .layout_areas + .as_ref() + .unwrap() + .terminal_panes + .iter() + .enumerate() + { + let terminal_pane_data = &mut self.terminal_pane_data[pane_idx]; + if let Some(pty) = terminal_pane_data.pty.as_ref() { + let (pty_height, pty_width) = + TerminalPane::calculate_pty_dimensions(*pane_area); - // Get current dimensions before resize - let (current_rows, current_cols) = pty.get_dimensions(); + // Get current dimensions before resize + let (current_rows, current_cols) = pty.get_dimensions(); - // Skip resize if dimensions haven't actually changed - if current_rows == pty_height && current_cols == pty_width { - continue; - } + // Skip resize if dimensions haven't actually changed + if current_rows == pty_height && current_cols == pty_width { + continue; + } - // With shared dimensions, we only need to call resize once per PTY instance - // The shared Arc> ensures all references see the update - let mut pty_clone = pty.as_ref().clone(); - pty_clone.resize(pty_height, pty_width)?; + // With shared dimensions, we only need to call resize once per PTY instance + // The shared Arc> ensures all references see the update + let mut pty_clone = pty.as_ref().clone(); + pty_clone.resize(pty_height, pty_width)?; - // If dimensions changed, mark for sort - if current_rows != pty_height { - needs_sort = true; - } + // If dimensions changed, mark for sort + if current_rows != pty_height { + needs_sort = true; } } + } - // Sort tasks if needed after all resizing is complete - if needs_sort { - self.dispatch_action(Action::SortTasks); - } + // Sort tasks if needed after all resizing is complete + if needs_sort { + self.dispatch_action(Action::SortTasks); + } } Ok(()) @@ -1731,9 +1719,7 @@ impl App { "🔗 Setting console messenger: is_connected={}", is_connected ); - self.state - .lock() - .set_console_messenger(messenger); + self.state.lock().set_console_messenger(messenger); // ALWAYS dispatch ConsoleMessengerAvailable(true) regardless of connection status // The TUI should work even without Nx Console connection @@ -1808,8 +1794,7 @@ impl App { let state = self.state.lock(); let task_status_map = state.get_task_status_map(); let task_graph = state.task_graph(); - let dependency_view = - DependencyView::new(task_status_map, task_graph, is_minimal); + let dependency_view = DependencyView::new(task_status_map, task_graph, is_minimal); f.render_stateful_widget(dependency_view, pane_area, dep_state); } } @@ -1920,9 +1905,7 @@ impl App { } pub fn set_estimated_task_timings(&mut self, timings: HashMap) { - self.state - .lock() - .set_estimated_task_timings(timings); + self.state.lock().set_estimated_task_timings(timings); } /// Handles automatic pane switching when a task becomes skipped. @@ -2312,7 +2295,10 @@ impl TuiApp for App { } fn get_selected_task_name(&self) -> Option { - self.selection_manager.lock().get_selected_task_name().cloned() + self.selection_manager + .lock() + .get_selected_task_name() + .cloned() } fn get_shared_state(&self) -> Arc> { diff --git a/packages/nx/src/native/tui/components/tasks_list.rs b/packages/nx/src/native/tui/components/tasks_list.rs index d92f0a00b5..378b57529a 100644 --- a/packages/nx/src/native/tui/components/tasks_list.rs +++ b/packages/nx/src/native/tui/components/tasks_list.rs @@ -1,5 +1,6 @@ use color_eyre::eyre::Result; use hashbrown::HashSet; +use parking_lot::Mutex; use ratatui::{ Frame, layout::{Alignment, Constraint, Direction, Layout, Rect}, @@ -11,7 +12,6 @@ use ratatui::{ }; use serde::{Deserialize, Serialize}; use std::any::Any; -use parking_lot::Mutex; use std::sync::Arc; use tokio::sync::mpsc::UnboundedSender; @@ -289,9 +289,7 @@ impl TasksList { return; } let lines = self.scroll_momentum.calculate_momentum(ScrollDirection::Up) as usize; - self.selection_manager - .lock() - .scroll_up(lines.max(1)); + self.selection_manager.lock().scroll_up(lines.max(1)); } /// Scrolls the task list down with momentum support @@ -302,9 +300,7 @@ impl TasksList { let lines = self .scroll_momentum .calculate_momentum(ScrollDirection::Down) as usize; - self.selection_manager - .lock() - .scroll_down(lines.max(1)); + self.selection_manager.lock().scroll_down(lines.max(1)); } /// Creates a list of task entries with separators between different status groups. @@ -634,9 +630,7 @@ impl TasksList { pub fn apply_filter(&mut self) { let mode = self.determine_selection_mode(); - self.selection_manager - .lock() - .set_selection_mode(mode); + self.selection_manager.lock().set_selection_mode(mode); // Apply filter if self.filter_text.is_empty() { @@ -700,9 +694,7 @@ impl TasksList { fn sort_tasks_with_mode(&mut self, mode_override: Option) { let mode = mode_override.unwrap_or_else(|| self.determine_selection_mode()); - self.selection_manager - .lock() - .set_selection_mode(mode); + self.selection_manager.lock().set_selection_mode(mode); // If we're in run one mode, and there are initiating tasks, sort them as highlighted tasks let highlighted_tasks = @@ -984,21 +976,17 @@ impl TasksList { .iter() .any(|t| t.status == TaskStatus::NotStarted); - self.selection_manager - .lock() - .handle_task_status_change( - task_id, - old_in_progress_index, - false, // new_is_in_progress = false - has_pending_tasks, - ); + self.selection_manager.lock().handle_task_status_change( + task_id, + old_in_progress_index, + false, // new_is_in_progress = false + has_pending_tasks, + ); } // Step 4: Set final mode based on current selection state let final_mode = self.determine_selection_mode(); - self.selection_manager - .lock() - .set_selection_mode(final_mode); + self.selection_manager.lock().set_selection_mode(final_mode); } /// Updates a task's status and triggers a sort of the list. @@ -1032,9 +1020,7 @@ impl TasksList { } // Ensure selected task is visible - self.selection_manager - .lock() - .ensure_selected_visible(); + self.selection_manager.lock().ensure_selected_visible(); } } @@ -1068,9 +1054,7 @@ impl TasksList { } self.sort_tasks(); // Explicitly scroll to ensure selected task is visible after sort - self.selection_manager - .lock() - .ensure_selected_visible(); + self.selection_manager.lock().ensure_selected_visible(); } fn generate_empty_row(&self, column_visibility: &ColumnVisibility) -> Row { @@ -1148,10 +1132,7 @@ impl TasksList { needs_scrollbar: bool, scroll_metrics: &ScrollMetrics, ) { - let visible_entries = self - .selection_manager - .lock() - .get_viewport_entries(); + let visible_entries = self.selection_manager.lock().get_viewport_entries(); let selected_style = Style::default() .fg(THEME.primary_fg) .add_modifier(Modifier::BOLD); @@ -1325,10 +1306,7 @@ impl TasksList { if let Some(task_name) = entry { // Find the task in the filtered list if let Some(task) = self.tasks.iter().find(|t| &t.name == task_name) { - let is_selected = self - .selection_manager - .lock() - .is_selected(task_name); + let is_selected = self.selection_manager.lock().is_selected(task_name); // Calculate absolute position to determine if the task is in the parallel section let absolute_idx = scroll_metrics.scroll_offset + row_idx; @@ -2089,9 +2067,7 @@ impl Component for TasksList { Action::SortTasks => { self.sort_tasks(); // Explicitly scroll to ensure selected task is visible after sort - self.selection_manager - .lock() - .ensure_selected_visible(); + self.selection_manager.lock().ensure_selected_visible(); } Action::UpdateTaskStatus(task_name, status) => { self.update_task_status(task_name, status); diff --git a/packages/nx/src/native/tui/inline_app.rs b/packages/nx/src/native/tui/inline_app.rs index 9714c3e328..563a91e86a 100644 --- a/packages/nx/src/native/tui/inline_app.rs +++ b/packages/nx/src/native/tui/inline_app.rs @@ -9,11 +9,11 @@ use std::collections::HashMap; use std::sync::Arc; use tokio::sync::mpsc::UnboundedSender; +use crate::native::ide::nx_console::messaging::NxConsoleMessageConnection; use crate::native::{ pseudo_terminal::pseudo_terminal::{ParserArc, WriterArc}, tasks::types::{Task, TaskGraph, TaskResult}, }; -use crate::native::ide::nx_console::messaging::NxConsoleMessageConnection; use super::action::Action; use super::components::tasks_list::TaskStatus; @@ -365,10 +365,8 @@ impl TuiApp for InlineApp { task_id: String, parser_and_writer: External<(ParserArc, WriterArc)>, ) { - let mut pty = PtyInstance::interactive( - parser_and_writer.0.clone(), - parser_and_writer.1.clone(), - ); + let mut pty = + PtyInstance::interactive(parser_and_writer.0.clone(), parser_and_writer.1.clone()); // Resize PTY to inline dimensions let (rows, cols) = self.calculate_inline_pty_dimensions(); @@ -481,7 +479,10 @@ impl InlineApp { } // Get the task to display (selected or first running) - let current_task = self.selected_task.clone().or_else(|| self.get_current_running_task()); + let current_task = self + .selected_task + .clone() + .or_else(|| self.get_current_running_task()); if let Some(current_task) = current_task { let state = self.state.lock(); @@ -507,10 +508,10 @@ impl InlineApp { // Render buffered scrollback above TUI using terminal.insert_before if !buffered_scrollback_lines.is_empty() { + use crate::native::tui::theme::THEME; + use ratatui::style::Style; use ratatui::text::Line; use ratatui::widgets::Paragraph; - use ratatui::style::Style; - use crate::native::tui::theme::THEME; let height = buffered_scrollback_lines.len() as u16; let _ = tui.insert_before(height, |buf| { @@ -551,9 +552,9 @@ impl InlineApp { let chunks = Layout::default() .direction(Direction::Vertical) .constraints([ - Constraint::Min(10), // Terminal output (at least 10 lines, takes remaining space) - Constraint::Length(3), // Status bar (compact: 3 lines with border) - Constraint::Length(3), // Progress bar (compact: 3 lines with border) + Constraint::Min(10), // Terminal output (at least 10 lines, takes remaining space) + Constraint::Length(3), // Status bar (compact: 3 lines with border) + Constraint::Length(3), // Progress bar (compact: 3 lines with border) ]) .split(area); @@ -568,12 +569,15 @@ impl InlineApp { } fn render_inline_status(&self, f: &mut ratatui::Frame, area: ratatui::layout::Rect) { + use crate::native::tui::theme::THEME; use ratatui::layout::{Constraint, Direction, Layout}; - use ratatui::widgets::{Block, Borders, Paragraph}; use ratatui::style::Style; - use crate::native::tui::theme::THEME; + use ratatui::widgets::{Block, Borders, Paragraph}; - let current_task = self.selected_task.clone().or_else(|| self.get_current_running_task()); + let current_task = self + .selected_task + .clone() + .or_else(|| self.get_current_running_task()); let status_text = if let Some(task_id) = current_task { format!(" Running: {} ", task_id) } else { @@ -611,9 +615,9 @@ impl InlineApp { } fn render_inline_progress(&self, f: &mut ratatui::Frame, area: ratatui::layout::Rect) { - use ratatui::widgets::{Block, Borders, Gauge}; - use ratatui::style::Style; use crate::native::tui::theme::THEME; + use ratatui::style::Style; + use ratatui::widgets::{Block, Borders, Gauge}; let completed_count = self.get_completed_task_count(); let state = self.state.lock(); @@ -642,7 +646,10 @@ impl InlineApp { fn render_inline_main_content(&mut self, f: &mut ratatui::Frame, area: ratatui::layout::Rect) { // Show selected task output if available, otherwise first running task - let current_task = self.selected_task.clone().or_else(|| self.get_current_running_task()); + let current_task = self + .selected_task + .clone() + .or_else(|| self.get_current_running_task()); if let Some(current_task) = current_task { let state = self.state.lock(); @@ -655,10 +662,10 @@ impl InlineApp { } // Fallback: show a message indicating no task is running - use ratatui::widgets::{Block, Borders, Paragraph}; - use ratatui::style::Style; - use ratatui::layout::Alignment; use crate::native::tui::theme::THEME; + use ratatui::layout::Alignment; + use ratatui::style::Style; + use ratatui::widgets::{Block, Borders, Paragraph}; let message = Paragraph::new(" Waiting for tasks to start... ") .style(Style::default().fg(THEME.secondary_fg)) @@ -679,10 +686,10 @@ impl InlineApp { area: ratatui::layout::Rect, pty: &Arc, ) { - use ratatui::widgets::Block; + use crate::native::tui::theme::THEME; use ratatui::style::Style; + use ratatui::widgets::Block; use tui_term::widget::PseudoTerminal; - use crate::native::tui::theme::THEME; // Scrollback is handled separately via terminal.insert_before // Just render the current terminal screen here @@ -794,7 +801,7 @@ mod tests { ))); // Create app with existing state - let app = InlineApp::with_state(existing_state.clone()).unwrap(); + let app = InlineApp::with_state(existing_state.clone(), None).unwrap(); // Verify it uses the same state assert!(Arc::ptr_eq(&app.state, &existing_state)); @@ -839,10 +846,7 @@ mod tests { let mut app = create_test_inline_app(); let (tx, _rx) = mpsc::unbounded_channel(); - let event = tui::Event::Key(KeyEvent::new( - KeyCode::Char('c'), - KeyModifiers::CONTROL, - )); + let event = tui::Event::Key(KeyEvent::new(KeyCode::Char('c'), KeyModifiers::CONTROL)); let result = app.handle_event(event, &tx).unwrap(); assert!(result); @@ -950,10 +954,7 @@ mod tests { // Verify status updated in state let state = app.state.lock(); - assert_eq!( - state.get_task_status("app1"), - Some(TaskStatus::InProgress) - ); + assert_eq!(state.get_task_status("app1"), Some(TaskStatus::InProgress)); } #[test] @@ -1002,10 +1003,7 @@ mod tests { app.update_task_status(String::from("app1"), TaskStatus::InProgress); // Should find running task - assert_eq!( - app.get_current_running_task(), - Some(String::from("app1")) - ); + assert_eq!(app.get_current_running_task(), Some(String::from("app1"))); } #[test] @@ -1220,8 +1218,8 @@ mod integration_tests { ))); // Create two apps with same state - let mut app1 = InlineApp::with_state(state.clone()).unwrap(); - let app2 = InlineApp::with_state(state.clone()).unwrap(); + let mut app1 = InlineApp::with_state(state.clone(), None).unwrap(); + let app2 = InlineApp::with_state(state.clone(), None).unwrap(); // Modify through app1 app1.update_task_status(String::from("shared"), TaskStatus::Success); diff --git a/packages/nx/src/native/tui/lifecycle.rs b/packages/nx/src/native/tui/lifecycle.rs index 5bfa306f53..992ecb482e 100644 --- a/packages/nx/src/native/tui/lifecycle.rs +++ b/packages/nx/src/native/tui/lifecycle.rs @@ -300,9 +300,7 @@ impl AppLifeCycle { Tui::new().map_err(|e| napi::Error::from_reason(e.to_string()))? } TuiMode::Inline => { - let inline_height = terminal::size() - .map(|(_cols, rows)| rows) - .unwrap_or(24); + let inline_height = terminal::size().map(|(_cols, rows)| rows).unwrap_or(24); Tui::new_with_viewport(ratatui::Viewport::Inline(inline_height)) .map_err(|e| napi::Error::from_reason(e.to_string()))? @@ -342,7 +340,9 @@ impl AppLifeCycle { app.with_app(|tui_app| { tui_app.set_done_callback(done_callback); tui_app.register_action_handler(action_tx.clone()).ok(); - tui_app.init(tui.size().unwrap_or(ratatui::layout::Size::new(80, 24))).ok(); + tui_app + .init(tui.size().unwrap_or(ratatui::layout::Size::new(80, 24))) + .ok(); }); debug!("✅ Initialized TUI App"); @@ -391,7 +391,8 @@ impl AppLifeCycle { // Create full-screen app instance let app_instance = App::with_state(shared_state, TuiMode::FullScreen) .expect("Failed to create full-screen app"); - let new_app = TuiAppInstance::FullScreen(Arc::new(Mutex::new(app_instance))); + let new_app = + TuiAppInstance::FullScreen(Arc::new(Mutex::new(app_instance))); // Initialize new app new_app.with_app(|tui_app| { @@ -449,9 +450,13 @@ impl AppLifeCycle { TuiAppInstance::FullScreen(Arc::new(Mutex::new(app_instance))) } TuiMode::Inline => { - debug!("Creating inline app with selected task: {:?}", selected_task); - let app_instance = InlineApp::with_state(shared_state, selected_task) - .expect("Failed to create inline app"); + debug!( + "Creating inline app with selected task: {:?}", + selected_task + ); + let app_instance = + InlineApp::with_state(shared_state, selected_task) + .expect("Failed to create inline app"); TuiAppInstance::Inline(Arc::new(Mutex::new(app_instance))) } }; diff --git a/packages/nx/src/native/tui/tui.rs b/packages/nx/src/native/tui/tui.rs index e22c040145..540ae86872 100644 --- a/packages/nx/src/native/tui/tui.rs +++ b/packages/nx/src/native/tui/tui.rs @@ -305,7 +305,11 @@ impl Tui { for (attempt, delay_ms) in delays.iter().enumerate() { if attempt > 0 { - debug!("⏳ Retry attempt {} after {}ms delay", attempt + 1, delay_ms); + debug!( + "⏳ Retry attempt {} after {}ms delay", + attempt + 1, + delay_ms + ); } // Wait for terminal to stabilize @@ -318,16 +322,26 @@ impl Tui { .unwrap_or(24); let viewport = ratatui::Viewport::Inline(inline_height); - match ratatui::Terminal::with_options(backend, ratatui::TerminalOptions { viewport }) { + match ratatui::Terminal::with_options( + backend, + ratatui::TerminalOptions { viewport }, + ) { Ok(term) => { if attempt > 0 { - debug!("✅ Successfully created inline viewport on attempt {}", attempt + 1); + debug!( + "✅ Successfully created inline viewport on attempt {}", + attempt + 1 + ); } terminal = Some(term); break; } Err(e) => { - debug!("❌ Failed to create inline viewport on attempt {}: {}", attempt + 1, e); + debug!( + "❌ Failed to create inline viewport on attempt {}: {}", + attempt + 1, + e + ); last_error = Some(e); } } diff --git a/packages/nx/src/native/tui/tui_app.rs b/packages/nx/src/native/tui/tui_app.rs index e5481583b4..3eb745b6af 100644 --- a/packages/nx/src/native/tui/tui_app.rs +++ b/packages/nx/src/native/tui/tui_app.rs @@ -7,11 +7,11 @@ use std::collections::HashMap; use std::sync::Arc; use tokio::sync::mpsc::UnboundedSender; +use crate::native::ide::nx_console::messaging::NxConsoleMessageConnection; use crate::native::{ pseudo_terminal::pseudo_terminal::{ParserArc, WriterArc}, tasks::types::{Task, TaskResult}, }; -use crate::native::ide::nx_console::messaging::NxConsoleMessageConnection; use super::action::Action; use super::components::tasks_list::TaskStatus; diff --git a/packages/nx/src/native/tui/tui_state.rs b/packages/nx/src/native/tui/tui_state.rs index be6bfb67ec..c20f468924 100644 --- a/packages/nx/src/native/tui/tui_state.rs +++ b/packages/nx/src/native/tui/tui_state.rs @@ -4,8 +4,8 @@ use std::collections::HashMap; use std::sync::Arc; use std::time::{Duration, Instant}; -use crate::native::tasks::types::{Task, TaskGraph}; use crate::native::ide::nx_console::messaging::NxConsoleMessageConnection; +use crate::native::tasks::types::{Task, TaskGraph}; use super::components::tasks_list::TaskStatus; use super::config::TuiConfig; @@ -642,10 +642,7 @@ mod integration_tests { } fn create_test_state() -> TuiState { - let tasks = vec![ - create_test_task("app1"), - create_test_task("app2"), - ]; + let tasks = vec![create_test_task("app1"), create_test_task("app2")]; let initiating_tasks = HashSet::from([String::from("app1")]); let task_graph = TaskGraph { tasks: HashMap::new(),