Skip to content

Run TUI commands in the active project directory #14613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oaleynik wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Run TUI commands in the active project directory #14613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion crates/but/src/command/legacy/status/tui/app/command_mode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::{ffi::OsString, process::Command};

use but_ctx::Context;
use crossterm::event::Event;
use ratatui::backend::Backend;
use ratatui_textarea::{CursorMove, TextArea};
Expand Down Expand Up @@ -35,6 +36,7 @@ impl App {
pub fn handle_command<T>(
&mut self,
message: CommandMessage,
ctx: &Context,
terminal_guard: &mut T,
out: &mut dyn TuiInputOutputChannel,
messages: &mut Vec<Message>,
Expand All @@ -47,7 +49,7 @@ impl App {
CommandMessage::Start(kind) => self.handle_command_start(kind),
CommandMessage::Input(ev) => self.handle_command_input(ev),
CommandMessage::Confirm => {
self.handle_command_confirm(terminal_guard, out, messages)?
self.handle_command_confirm(ctx, terminal_guard, out, messages)?
}
}

Expand Down Expand Up @@ -79,6 +81,7 @@ impl App {

fn handle_command_confirm<T>(
&mut self,
ctx: &Context,
terminal_guard: &mut T,
out: &mut dyn TuiInputOutputChannel,
messages: &mut Vec<Message>,
Expand Down Expand Up @@ -123,6 +126,8 @@ impl App {
}
};

cmd.current_dir(ctx.workdir_or_fail()?);

let status = cmd.spawn()?.wait()?;

if !IN_TEST {
Expand Down
2 changes: 1 addition & 1 deletion crates/but/src/command/legacy/status/tui/app/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ impl App {
self.handle_reword(reword_message, ctx, terminal_guard, messages)?
}
Message::Command(command_message) => {
self.handle_command(command_message, terminal_guard, out, messages)?
self.handle_command(command_message, ctx, terminal_guard, out, messages)?
}
Message::Move(move_message) => self.handle_move(move_message, ctx, messages)?,
Message::NewBranch => {
Expand Down
Loading