Finn Evers
a96015b3c5
This PR fixes an issue where extension operations would never show in the activity indicator despite this being implemented for ages. This happened because we were always returning `None` whenever the app has a global auto updater, which is always the case, so the code path for showing extension updates in the indicator could never be hit despite existing prior. Also slightly improves the messages shown for ongoing extension operations, as these were previously context unaware. While I was at this, I also quickly took a stab at cleaning up some remotely related stuff, namely: - The `AnimationExt` trait is now by default only implemented for anything that also implements `IntoElement`. This prevents `with_animation` from showing up for e.g. `u32` within the suggestions (finally). - Commonly used animations are now implemented in the `CommonAnimationExt` trait within the `ui` crate so the needed code does not always need to be copied and element IDs for the animations are truly unique. Relevant change here regarding the original issue is the change from the `return match` to just a `match` within the activitiy indicator, which solved the issue at hand. If we find this to be too noisy at some point, we can easily revisit, but I think this holds important enough information to be shown in the activity indicator, especially whilst developing extensions. Release Notes: - Extension installation and updates will now be shown in the activity indicator.
896 lines
31 KiB
Rust
896 lines
31 KiB
Rust
use crate::{
|
|
schema::json_schema_for,
|
|
ui::{COLLAPSED_LINES, ToolOutputPreview},
|
|
};
|
|
use action_log::ActionLog;
|
|
use agent_settings;
|
|
use anyhow::{Context as _, Result, anyhow};
|
|
use assistant_tool::{Tool, ToolCard, ToolResult, ToolUseStatus};
|
|
use futures::{FutureExt as _, future::Shared};
|
|
use gpui::{
|
|
AnyWindowHandle, App, AppContext, Empty, Entity, EntityId, Task, TextStyleRefinement,
|
|
WeakEntity, Window,
|
|
};
|
|
use language::LineEnding;
|
|
use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
|
|
use markdown::{Markdown, MarkdownElement, MarkdownStyle};
|
|
use portable_pty::{CommandBuilder, PtySize, native_pty_system};
|
|
use project::Project;
|
|
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use settings::Settings;
|
|
use std::{
|
|
env,
|
|
path::{Path, PathBuf},
|
|
process::ExitStatus,
|
|
sync::Arc,
|
|
time::{Duration, Instant},
|
|
};
|
|
use terminal_view::TerminalView;
|
|
use theme::ThemeSettings;
|
|
use ui::{CommonAnimationExt, Disclosure, Tooltip, prelude::*};
|
|
use util::{
|
|
ResultExt, get_system_shell, markdown::MarkdownInlineCode, size::format_file_size,
|
|
time::duration_alt_display,
|
|
};
|
|
use workspace::Workspace;
|
|
|
|
const COMMAND_OUTPUT_LIMIT: usize = 16 * 1024;
|
|
|
|
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
|
|
pub struct TerminalToolInput {
|
|
/// The one-liner command to execute.
|
|
command: String,
|
|
/// Working directory for the command. This must be one of the root directories of the project.
|
|
cd: String,
|
|
}
|
|
|
|
pub struct TerminalTool {
|
|
determine_shell: Shared<Task<String>>,
|
|
}
|
|
|
|
impl TerminalTool {
|
|
pub const NAME: &str = "terminal";
|
|
|
|
pub(crate) fn new(cx: &mut App) -> Self {
|
|
let determine_shell = cx.background_spawn(async move {
|
|
if cfg!(windows) {
|
|
return get_system_shell();
|
|
}
|
|
|
|
if which::which("bash").is_ok() {
|
|
"bash".into()
|
|
} else {
|
|
get_system_shell()
|
|
}
|
|
});
|
|
Self {
|
|
determine_shell: determine_shell.shared(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Tool for TerminalTool {
|
|
fn name(&self) -> String {
|
|
Self::NAME.to_string()
|
|
}
|
|
|
|
fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
|
|
true
|
|
}
|
|
|
|
fn may_perform_edits(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
fn description(&self) -> String {
|
|
include_str!("./terminal_tool/description.md").to_string()
|
|
}
|
|
|
|
fn icon(&self) -> IconName {
|
|
IconName::ToolTerminal
|
|
}
|
|
|
|
fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
|
|
json_schema_for::<TerminalToolInput>(format)
|
|
}
|
|
|
|
fn ui_text(&self, input: &serde_json::Value) -> String {
|
|
match serde_json::from_value::<TerminalToolInput>(input.clone()) {
|
|
Ok(input) => {
|
|
let mut lines = input.command.lines();
|
|
let first_line = lines.next().unwrap_or_default();
|
|
let remaining_line_count = lines.count();
|
|
match remaining_line_count {
|
|
0 => MarkdownInlineCode(first_line).to_string(),
|
|
1 => MarkdownInlineCode(&format!(
|
|
"{} - {} more line",
|
|
first_line, remaining_line_count
|
|
))
|
|
.to_string(),
|
|
n => MarkdownInlineCode(&format!("{} - {} more lines", first_line, n))
|
|
.to_string(),
|
|
}
|
|
}
|
|
Err(_) => "Run terminal command".to_string(),
|
|
}
|
|
}
|
|
|
|
fn run(
|
|
self: Arc<Self>,
|
|
input: serde_json::Value,
|
|
_request: Arc<LanguageModelRequest>,
|
|
project: Entity<Project>,
|
|
_action_log: Entity<ActionLog>,
|
|
_model: Arc<dyn LanguageModel>,
|
|
window: Option<AnyWindowHandle>,
|
|
cx: &mut App,
|
|
) -> ToolResult {
|
|
let input: TerminalToolInput = match serde_json::from_value(input) {
|
|
Ok(input) => input,
|
|
Err(err) => return Task::ready(Err(anyhow!(err))).into(),
|
|
};
|
|
|
|
let working_dir = match working_dir(&input, &project, cx) {
|
|
Ok(dir) => dir,
|
|
Err(err) => return Task::ready(Err(err)).into(),
|
|
};
|
|
let program = self.determine_shell.clone();
|
|
let command = if cfg!(windows) {
|
|
format!("$null | & {{{}}}", input.command.replace("\"", "'"))
|
|
} else if let Some(cwd) = working_dir
|
|
.as_ref()
|
|
.and_then(|cwd| cwd.as_os_str().to_str())
|
|
{
|
|
// Make sure once we're *inside* the shell, we cd into `cwd`
|
|
format!("(cd {cwd}; {}) </dev/null", input.command)
|
|
} else {
|
|
format!("({}) </dev/null", input.command)
|
|
};
|
|
let args = vec!["-c".into(), command];
|
|
|
|
let cwd = working_dir.clone();
|
|
let env = match &working_dir {
|
|
Some(dir) => project.update(cx, |project, cx| {
|
|
project.directory_environment(dir.as_path().into(), cx)
|
|
}),
|
|
None => Task::ready(None).shared(),
|
|
};
|
|
|
|
let env = cx.spawn(async move |_| {
|
|
let mut env = env.await.unwrap_or_default();
|
|
if cfg!(unix) {
|
|
env.insert("PAGER".into(), "cat".into());
|
|
}
|
|
env
|
|
});
|
|
|
|
let Some(window) = window else {
|
|
// Headless setup, a test or eval. Our terminal subsystem requires a workspace,
|
|
// so bypass it and provide a convincing imitation using a pty.
|
|
let task = cx.background_spawn(async move {
|
|
let env = env.await;
|
|
let pty_system = native_pty_system();
|
|
let program = program.await;
|
|
let mut cmd = CommandBuilder::new(program);
|
|
cmd.args(args);
|
|
for (k, v) in env {
|
|
cmd.env(k, v);
|
|
}
|
|
if let Some(cwd) = cwd {
|
|
cmd.cwd(cwd);
|
|
}
|
|
let pair = pty_system.openpty(PtySize {
|
|
rows: 24,
|
|
cols: 80,
|
|
..Default::default()
|
|
})?;
|
|
let mut child = pair.slave.spawn_command(cmd)?;
|
|
let mut reader = pair.master.try_clone_reader()?;
|
|
drop(pair);
|
|
let mut content = String::new();
|
|
reader.read_to_string(&mut content)?;
|
|
// Massage the pty output a bit to try to match what the terminal codepath gives us
|
|
LineEnding::normalize(&mut content);
|
|
content = content
|
|
.chars()
|
|
.filter(|c| c.is_ascii_whitespace() || !c.is_ascii_control())
|
|
.collect();
|
|
let content = content.trim_start().trim_start_matches("^D");
|
|
let exit_status = child.wait()?;
|
|
let (processed_content, _) =
|
|
process_content(content, &input.command, Some(exit_status));
|
|
Ok(processed_content.into())
|
|
});
|
|
return ToolResult {
|
|
output: task,
|
|
card: None,
|
|
};
|
|
};
|
|
|
|
let terminal = cx.spawn({
|
|
let project = project.downgrade();
|
|
async move |cx| {
|
|
let program = program.await;
|
|
let env = env.await;
|
|
project
|
|
.update(cx, |project, cx| {
|
|
project.create_terminal_task(
|
|
task::SpawnInTerminal {
|
|
command: Some(program),
|
|
args,
|
|
cwd,
|
|
env,
|
|
..Default::default()
|
|
},
|
|
cx,
|
|
)
|
|
})?
|
|
.await
|
|
}
|
|
});
|
|
|
|
let command_markdown = cx.new(|cx| {
|
|
Markdown::new(
|
|
format!("```bash\n{}\n```", input.command).into(),
|
|
None,
|
|
None,
|
|
cx,
|
|
)
|
|
});
|
|
|
|
let card = cx.new(|cx| {
|
|
TerminalToolCard::new(
|
|
command_markdown.clone(),
|
|
working_dir.clone(),
|
|
cx.entity_id(),
|
|
cx,
|
|
)
|
|
});
|
|
|
|
let output = cx.spawn({
|
|
let card = card.clone();
|
|
async move |cx| {
|
|
let terminal = terminal.await?;
|
|
let workspace = window
|
|
.downcast::<Workspace>()
|
|
.and_then(|handle| handle.entity(cx).ok())
|
|
.context("no workspace entity in root of window")?;
|
|
|
|
let terminal_view = window.update(cx, |_, window, cx| {
|
|
cx.new(|cx| {
|
|
let mut view = TerminalView::new(
|
|
terminal.clone(),
|
|
workspace.downgrade(),
|
|
None,
|
|
project.downgrade(),
|
|
window,
|
|
cx,
|
|
);
|
|
view.set_embedded_mode(None, cx);
|
|
view
|
|
})
|
|
})?;
|
|
|
|
card.update(cx, |card, _| {
|
|
card.terminal = Some(terminal_view.clone());
|
|
card.start_instant = Instant::now();
|
|
})
|
|
.log_err();
|
|
|
|
let exit_status = terminal
|
|
.update(cx, |terminal, cx| terminal.wait_for_completed_task(cx))?
|
|
.await;
|
|
let (content, content_line_count) = terminal.read_with(cx, |terminal, _| {
|
|
(terminal.get_content(), terminal.total_lines())
|
|
})?;
|
|
|
|
let previous_len = content.len();
|
|
let (processed_content, finished_with_empty_output) = process_content(
|
|
&content,
|
|
&input.command,
|
|
exit_status.map(portable_pty::ExitStatus::from),
|
|
);
|
|
|
|
card.update(cx, |card, _| {
|
|
card.command_finished = true;
|
|
card.exit_status = exit_status;
|
|
card.was_content_truncated = processed_content.len() < previous_len;
|
|
card.original_content_len = previous_len;
|
|
card.content_line_count = content_line_count;
|
|
card.finished_with_empty_output = finished_with_empty_output;
|
|
card.elapsed_time = Some(card.start_instant.elapsed());
|
|
})
|
|
.log_err();
|
|
|
|
Ok(processed_content.into())
|
|
}
|
|
});
|
|
|
|
ToolResult {
|
|
output,
|
|
card: Some(card.into()),
|
|
}
|
|
}
|
|
}
|
|
|
|
fn process_content(
|
|
content: &str,
|
|
command: &str,
|
|
exit_status: Option<portable_pty::ExitStatus>,
|
|
) -> (String, bool) {
|
|
let should_truncate = content.len() > COMMAND_OUTPUT_LIMIT;
|
|
|
|
let content = if should_truncate {
|
|
let mut end_ix = COMMAND_OUTPUT_LIMIT.min(content.len());
|
|
while !content.is_char_boundary(end_ix) {
|
|
end_ix -= 1;
|
|
}
|
|
// Don't truncate mid-line, clear the remainder of the last line
|
|
end_ix = content[..end_ix].rfind('\n').unwrap_or(end_ix);
|
|
&content[..end_ix]
|
|
} else {
|
|
content
|
|
};
|
|
let content = content.trim();
|
|
let is_empty = content.is_empty();
|
|
let content = format!("```\n{content}\n```");
|
|
let content = if should_truncate {
|
|
format!(
|
|
"Command output too long. The first {} bytes:\n\n{content}",
|
|
content.len(),
|
|
)
|
|
} else {
|
|
content
|
|
};
|
|
|
|
let content = match exit_status {
|
|
Some(exit_status) if exit_status.success() => {
|
|
if is_empty {
|
|
"Command executed successfully.".to_string()
|
|
} else {
|
|
content
|
|
}
|
|
}
|
|
Some(exit_status) => {
|
|
if is_empty {
|
|
format!(
|
|
"Command \"{command}\" failed with exit code {}.",
|
|
exit_status.exit_code()
|
|
)
|
|
} else {
|
|
format!(
|
|
"Command \"{command}\" failed with exit code {}.\n\n{content}",
|
|
exit_status.exit_code()
|
|
)
|
|
}
|
|
}
|
|
None => {
|
|
format!(
|
|
"Command failed or was interrupted.\nPartial output captured:\n\n{}",
|
|
content,
|
|
)
|
|
}
|
|
};
|
|
(content, is_empty)
|
|
}
|
|
|
|
fn working_dir(
|
|
input: &TerminalToolInput,
|
|
project: &Entity<Project>,
|
|
cx: &mut App,
|
|
) -> Result<Option<PathBuf>> {
|
|
let project = project.read(cx);
|
|
let cd = &input.cd;
|
|
|
|
if cd == "." || cd.is_empty() {
|
|
// Accept "." or "" as meaning "the one worktree" if we only have one worktree.
|
|
let mut worktrees = project.worktrees(cx);
|
|
|
|
match worktrees.next() {
|
|
Some(worktree) => {
|
|
anyhow::ensure!(
|
|
worktrees.next().is_none(),
|
|
"'.' is ambiguous in multi-root workspaces. Please specify a root directory explicitly.",
|
|
);
|
|
Ok(Some(worktree.read(cx).abs_path().to_path_buf()))
|
|
}
|
|
None => Ok(None),
|
|
}
|
|
} else {
|
|
let input_path = Path::new(cd);
|
|
|
|
if input_path.is_absolute() {
|
|
// Absolute paths are allowed, but only if they're in one of the project's worktrees.
|
|
if project
|
|
.worktrees(cx)
|
|
.any(|worktree| input_path.starts_with(&worktree.read(cx).abs_path()))
|
|
{
|
|
return Ok(Some(input_path.into()));
|
|
}
|
|
} else if let Some(worktree) = project.worktree_for_root_name(cd, cx) {
|
|
return Ok(Some(worktree.read(cx).abs_path().to_path_buf()));
|
|
}
|
|
|
|
anyhow::bail!("`cd` directory {cd:?} was not in any of the project's worktrees.");
|
|
}
|
|
}
|
|
|
|
struct TerminalToolCard {
|
|
input_command: Entity<Markdown>,
|
|
working_dir: Option<PathBuf>,
|
|
entity_id: EntityId,
|
|
exit_status: Option<ExitStatus>,
|
|
terminal: Option<Entity<TerminalView>>,
|
|
command_finished: bool,
|
|
was_content_truncated: bool,
|
|
finished_with_empty_output: bool,
|
|
content_line_count: usize,
|
|
original_content_len: usize,
|
|
preview_expanded: bool,
|
|
start_instant: Instant,
|
|
elapsed_time: Option<Duration>,
|
|
}
|
|
|
|
impl TerminalToolCard {
|
|
pub fn new(
|
|
input_command: Entity<Markdown>,
|
|
working_dir: Option<PathBuf>,
|
|
entity_id: EntityId,
|
|
cx: &mut Context<Self>,
|
|
) -> Self {
|
|
let expand_terminal_card =
|
|
agent_settings::AgentSettings::get_global(cx).expand_terminal_card;
|
|
Self {
|
|
input_command,
|
|
working_dir,
|
|
entity_id,
|
|
exit_status: None,
|
|
terminal: None,
|
|
command_finished: false,
|
|
was_content_truncated: false,
|
|
finished_with_empty_output: false,
|
|
original_content_len: 0,
|
|
content_line_count: 0,
|
|
preview_expanded: expand_terminal_card,
|
|
start_instant: Instant::now(),
|
|
elapsed_time: None,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ToolCard for TerminalToolCard {
|
|
fn render(
|
|
&mut self,
|
|
status: &ToolUseStatus,
|
|
window: &mut Window,
|
|
_workspace: WeakEntity<Workspace>,
|
|
cx: &mut Context<Self>,
|
|
) -> impl IntoElement {
|
|
let Some(terminal) = self.terminal.as_ref() else {
|
|
return Empty.into_any();
|
|
};
|
|
|
|
let tool_failed = matches!(status, ToolUseStatus::Error(_));
|
|
|
|
let command_failed =
|
|
self.command_finished && self.exit_status.is_none_or(|code| !code.success());
|
|
|
|
if (tool_failed || command_failed) && self.elapsed_time.is_none() {
|
|
self.elapsed_time = Some(self.start_instant.elapsed());
|
|
}
|
|
let time_elapsed = self
|
|
.elapsed_time
|
|
.unwrap_or_else(|| self.start_instant.elapsed());
|
|
|
|
let header_bg = cx
|
|
.theme()
|
|
.colors()
|
|
.element_background
|
|
.blend(cx.theme().colors().editor_foreground.opacity(0.025));
|
|
|
|
let border_color = cx.theme().colors().border.opacity(0.6);
|
|
|
|
let path = self
|
|
.working_dir
|
|
.as_ref()
|
|
.cloned()
|
|
.or_else(|| env::current_dir().ok())
|
|
.map(|path| format!("{}", path.display()))
|
|
.unwrap_or_else(|| "current directory".to_string());
|
|
|
|
let header = h_flex()
|
|
.flex_none()
|
|
.gap_1()
|
|
.justify_between()
|
|
.rounded_t_md()
|
|
.child(
|
|
div()
|
|
.id(("command-target-path", self.entity_id))
|
|
.w_full()
|
|
.max_w_full()
|
|
.overflow_x_scroll()
|
|
.child(
|
|
Label::new(path)
|
|
.buffer_font(cx)
|
|
.size(LabelSize::XSmall)
|
|
.color(Color::Muted),
|
|
),
|
|
)
|
|
.when(!self.command_finished, |header| {
|
|
header.child(
|
|
Icon::new(IconName::ArrowCircle)
|
|
.size(IconSize::XSmall)
|
|
.color(Color::Info)
|
|
.with_rotate_animation(2),
|
|
)
|
|
})
|
|
.when(tool_failed || command_failed, |header| {
|
|
header.child(
|
|
div()
|
|
.id(("terminal-tool-error-code-indicator", self.entity_id))
|
|
.child(
|
|
Icon::new(IconName::Close)
|
|
.size(IconSize::Small)
|
|
.color(Color::Error),
|
|
)
|
|
.when(command_failed && self.exit_status.is_some(), |this| {
|
|
this.tooltip(Tooltip::text(format!(
|
|
"Exited with code {}",
|
|
self.exit_status
|
|
.and_then(|status| status.code())
|
|
.unwrap_or(-1),
|
|
)))
|
|
})
|
|
.when(
|
|
!command_failed && tool_failed && status.error().is_some(),
|
|
|this| {
|
|
this.tooltip(Tooltip::text(format!(
|
|
"Error: {}",
|
|
status.error().unwrap(),
|
|
)))
|
|
},
|
|
),
|
|
)
|
|
})
|
|
.when(self.was_content_truncated, |header| {
|
|
let tooltip = if self.content_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
|
|
"Output exceeded terminal max lines and was \
|
|
truncated, the model received the first 16 KB."
|
|
.to_string()
|
|
} else {
|
|
format!(
|
|
"Output is {} long, to avoid unexpected token usage, \
|
|
only 16 KB was sent back to the model.",
|
|
format_file_size(self.original_content_len as u64, true),
|
|
)
|
|
};
|
|
header.child(
|
|
h_flex()
|
|
.id(("terminal-tool-truncated-label", self.entity_id))
|
|
.tooltip(Tooltip::text(tooltip))
|
|
.gap_1()
|
|
.child(
|
|
Icon::new(IconName::Info)
|
|
.size(IconSize::XSmall)
|
|
.color(Color::Ignored),
|
|
)
|
|
.child(
|
|
Label::new("Truncated")
|
|
.color(Color::Muted)
|
|
.size(LabelSize::Small),
|
|
),
|
|
)
|
|
})
|
|
.when(time_elapsed > Duration::from_secs(10), |header| {
|
|
header.child(
|
|
Label::new(format!("({})", duration_alt_display(time_elapsed)))
|
|
.buffer_font(cx)
|
|
.color(Color::Muted)
|
|
.size(LabelSize::Small),
|
|
)
|
|
})
|
|
.when(!self.finished_with_empty_output, |header| {
|
|
header.child(
|
|
Disclosure::new(
|
|
("terminal-tool-disclosure", self.entity_id),
|
|
self.preview_expanded,
|
|
)
|
|
.opened_icon(IconName::ChevronUp)
|
|
.closed_icon(IconName::ChevronDown)
|
|
.on_click(cx.listener(
|
|
move |this, _event, _window, _cx| {
|
|
this.preview_expanded = !this.preview_expanded;
|
|
},
|
|
)),
|
|
)
|
|
});
|
|
|
|
v_flex()
|
|
.mb_2()
|
|
.border_1()
|
|
.when(tool_failed || command_failed, |card| card.border_dashed())
|
|
.border_color(border_color)
|
|
.rounded_lg()
|
|
.overflow_hidden()
|
|
.child(
|
|
v_flex()
|
|
.p_2()
|
|
.gap_0p5()
|
|
.bg(header_bg)
|
|
.text_xs()
|
|
.child(header)
|
|
.child(
|
|
MarkdownElement::new(
|
|
self.input_command.clone(),
|
|
markdown_style(window, cx),
|
|
)
|
|
.code_block_renderer(
|
|
markdown::CodeBlockRenderer::Default {
|
|
copy_button: false,
|
|
copy_button_on_hover: true,
|
|
border: false,
|
|
},
|
|
),
|
|
),
|
|
)
|
|
.when(
|
|
self.preview_expanded && !self.finished_with_empty_output,
|
|
|this| {
|
|
this.child(
|
|
div()
|
|
.pt_2()
|
|
.border_t_1()
|
|
.when(tool_failed || command_failed, |card| card.border_dashed())
|
|
.border_color(border_color)
|
|
.bg(cx.theme().colors().editor_background)
|
|
.rounded_b_md()
|
|
.text_ui_sm(cx)
|
|
.child({
|
|
let content_mode = terminal.read(cx).content_mode(window, cx);
|
|
|
|
if content_mode.is_scrollable() {
|
|
div().h_72().child(terminal.clone()).into_any_element()
|
|
} else {
|
|
ToolOutputPreview::new(
|
|
terminal.clone().into_any_element(),
|
|
terminal.entity_id(),
|
|
)
|
|
.with_total_lines(self.content_line_count)
|
|
.toggle_state(!content_mode.is_limited())
|
|
.on_toggle({
|
|
let terminal = terminal.clone();
|
|
move |is_expanded, _, cx| {
|
|
terminal.update(cx, |terminal, cx| {
|
|
terminal.set_embedded_mode(
|
|
if is_expanded {
|
|
None
|
|
} else {
|
|
Some(COLLAPSED_LINES)
|
|
},
|
|
cx,
|
|
);
|
|
});
|
|
}
|
|
})
|
|
.into_any_element()
|
|
}
|
|
}),
|
|
)
|
|
},
|
|
)
|
|
.into_any()
|
|
}
|
|
}
|
|
|
|
fn markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
|
|
let theme_settings = ThemeSettings::get_global(cx);
|
|
let buffer_font_size = TextSize::Default.rems(cx);
|
|
let mut text_style = window.text_style();
|
|
|
|
text_style.refine(&TextStyleRefinement {
|
|
font_family: Some(theme_settings.buffer_font.family.clone()),
|
|
font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
|
|
font_features: Some(theme_settings.buffer_font.features.clone()),
|
|
font_size: Some(buffer_font_size.into()),
|
|
color: Some(cx.theme().colors().text),
|
|
..Default::default()
|
|
});
|
|
|
|
MarkdownStyle {
|
|
base_text_style: text_style.clone(),
|
|
selection_background_color: cx.theme().colors().element_selection_background,
|
|
..Default::default()
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use editor::EditorSettings;
|
|
use fs::RealFs;
|
|
use gpui::{BackgroundExecutor, TestAppContext};
|
|
use language_model::fake_provider::FakeLanguageModel;
|
|
use pretty_assertions::assert_eq;
|
|
use serde_json::json;
|
|
use settings::{Settings, SettingsStore};
|
|
use terminal::terminal_settings::TerminalSettings;
|
|
use theme::ThemeSettings;
|
|
use util::{ResultExt as _, test::TempTree};
|
|
|
|
use super::*;
|
|
|
|
fn init_test(executor: &BackgroundExecutor, cx: &mut TestAppContext) {
|
|
zlog::init_test();
|
|
|
|
executor.allow_parking();
|
|
cx.update(|cx| {
|
|
let settings_store = SettingsStore::test(cx);
|
|
cx.set_global(settings_store);
|
|
language::init(cx);
|
|
Project::init_settings(cx);
|
|
workspace::init_settings(cx);
|
|
ThemeSettings::register(cx);
|
|
TerminalSettings::register(cx);
|
|
EditorSettings::register(cx);
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_interactive_command(executor: BackgroundExecutor, cx: &mut TestAppContext) {
|
|
if cfg!(windows) {
|
|
return;
|
|
}
|
|
|
|
init_test(&executor, cx);
|
|
|
|
let fs = Arc::new(RealFs::new(None, executor));
|
|
let tree = TempTree::new(json!({
|
|
"project": {},
|
|
}));
|
|
let project: Entity<Project> =
|
|
Project::test(fs, [tree.path().join("project").as_path()], cx).await;
|
|
let action_log = cx.update(|cx| cx.new(|_| ActionLog::new(project.clone())));
|
|
let model = Arc::new(FakeLanguageModel::default());
|
|
|
|
let input = TerminalToolInput {
|
|
command: "cat".to_owned(),
|
|
cd: tree
|
|
.path()
|
|
.join("project")
|
|
.as_path()
|
|
.to_string_lossy()
|
|
.to_string(),
|
|
};
|
|
let result = cx.update(|cx| {
|
|
TerminalTool::run(
|
|
Arc::new(TerminalTool::new(cx)),
|
|
serde_json::to_value(input).unwrap(),
|
|
Arc::default(),
|
|
project.clone(),
|
|
action_log.clone(),
|
|
model,
|
|
None,
|
|
cx,
|
|
)
|
|
});
|
|
|
|
let output = result.output.await.log_err().unwrap().content;
|
|
assert_eq!(output.as_str().unwrap(), "Command executed successfully.");
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_working_directory(executor: BackgroundExecutor, cx: &mut TestAppContext) {
|
|
if cfg!(windows) {
|
|
return;
|
|
}
|
|
|
|
init_test(&executor, cx);
|
|
|
|
let fs = Arc::new(RealFs::new(None, executor));
|
|
let tree = TempTree::new(json!({
|
|
"project": {},
|
|
"other-project": {},
|
|
}));
|
|
let project: Entity<Project> =
|
|
Project::test(fs, [tree.path().join("project").as_path()], cx).await;
|
|
let action_log = cx.update(|cx| cx.new(|_| ActionLog::new(project.clone())));
|
|
let model = Arc::new(FakeLanguageModel::default());
|
|
|
|
let check = |input, expected, cx: &mut App| {
|
|
let headless_result = TerminalTool::run(
|
|
Arc::new(TerminalTool::new(cx)),
|
|
serde_json::to_value(input).unwrap(),
|
|
Arc::default(),
|
|
project.clone(),
|
|
action_log.clone(),
|
|
model.clone(),
|
|
None,
|
|
cx,
|
|
);
|
|
cx.spawn(async move |_| {
|
|
let output = headless_result.output.await.map(|output| output.content);
|
|
assert_eq!(
|
|
output
|
|
.ok()
|
|
.and_then(|content| content.as_str().map(ToString::to_string)),
|
|
expected
|
|
);
|
|
})
|
|
};
|
|
|
|
cx.update(|cx| {
|
|
check(
|
|
TerminalToolInput {
|
|
command: "pwd".into(),
|
|
cd: ".".into(),
|
|
},
|
|
Some(format!(
|
|
"```\n{}\n```",
|
|
tree.path().join("project").display()
|
|
)),
|
|
cx,
|
|
)
|
|
})
|
|
.await;
|
|
|
|
cx.update(|cx| {
|
|
check(
|
|
TerminalToolInput {
|
|
command: "pwd".into(),
|
|
cd: "other-project".into(),
|
|
},
|
|
None, // other-project is a dir, but *not* a worktree (yet)
|
|
cx,
|
|
)
|
|
})
|
|
.await;
|
|
|
|
// Absolute path above the worktree root
|
|
cx.update(|cx| {
|
|
check(
|
|
TerminalToolInput {
|
|
command: "pwd".into(),
|
|
cd: tree.path().to_string_lossy().into(),
|
|
},
|
|
None,
|
|
cx,
|
|
)
|
|
})
|
|
.await;
|
|
|
|
project
|
|
.update(cx, |project, cx| {
|
|
project.create_worktree(tree.path().join("other-project"), true, cx)
|
|
})
|
|
.await
|
|
.unwrap();
|
|
|
|
cx.update(|cx| {
|
|
check(
|
|
TerminalToolInput {
|
|
command: "pwd".into(),
|
|
cd: "other-project".into(),
|
|
},
|
|
Some(format!(
|
|
"```\n{}\n```",
|
|
tree.path().join("other-project").display()
|
|
)),
|
|
cx,
|
|
)
|
|
})
|
|
.await;
|
|
|
|
cx.update(|cx| {
|
|
check(
|
|
TerminalToolInput {
|
|
command: "pwd".into(),
|
|
cd: ".".into(),
|
|
},
|
|
None,
|
|
cx,
|
|
)
|
|
})
|
|
.await;
|
|
}
|
|
}
|