
This PR: - Makes slash commands easier to compose by adding a concept, `CompletionIntent`. When using `tab` on a completion in the assistant panel, that completion item will be expanded but the associated command will not be run. Using `enter` will still either run the completion item or continue command composition as before. - Fixes a bug where running `/diagnostics` on a project with no diagnostics will delete the entire command, rather than rendering an empty header. - Improves the autocomplete rendering for files, showing when directories are selected and re-arranging the results to have the file name or trailing directory show first. <img width="642" alt="Screenshot 2024-08-13 at 8 12 43 PM" src="https://github.com/user-attachments/assets/97c96cd2-741f-4f15-ad03-7cf78129a71c"> Release Notes: - N/A
113 lines
3.3 KiB
Rust
113 lines
3.3 KiB
Rust
use std::sync::atomic::AtomicBool;
|
|
use std::sync::Arc;
|
|
|
|
use anyhow::Result;
|
|
use assistant_slash_command::{
|
|
ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
|
|
};
|
|
use gpui::{AppContext, Task, WeakView};
|
|
use language::{CodeLabel, LspAdapterDelegate};
|
|
use terminal_view::{terminal_panel::TerminalPanel, TerminalView};
|
|
use ui::prelude::*;
|
|
use workspace::{dock::Panel, Workspace};
|
|
|
|
use crate::DEFAULT_CONTEXT_LINES;
|
|
|
|
use super::create_label_for_command;
|
|
|
|
pub(crate) struct TerminalSlashCommand;
|
|
|
|
const LINE_COUNT_ARG: &str = "--line-count";
|
|
|
|
impl SlashCommand for TerminalSlashCommand {
|
|
fn name(&self) -> String {
|
|
"terminal".into()
|
|
}
|
|
|
|
fn label(&self, cx: &AppContext) -> CodeLabel {
|
|
create_label_for_command("terminal", &[LINE_COUNT_ARG], cx)
|
|
}
|
|
|
|
fn description(&self) -> String {
|
|
"insert terminal output".into()
|
|
}
|
|
|
|
fn menu_text(&self) -> String {
|
|
"Insert Terminal Output".into()
|
|
}
|
|
|
|
fn requires_argument(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
fn complete_argument(
|
|
self: Arc<Self>,
|
|
_query: String,
|
|
_cancel: Arc<AtomicBool>,
|
|
_workspace: Option<WeakView<Workspace>>,
|
|
_cx: &mut WindowContext,
|
|
) -> Task<Result<Vec<ArgumentCompletion>>> {
|
|
Task::ready(Ok(vec![ArgumentCompletion {
|
|
label: LINE_COUNT_ARG.into(),
|
|
new_text: LINE_COUNT_ARG.to_string(),
|
|
run_command: true,
|
|
}]))
|
|
}
|
|
|
|
fn run(
|
|
self: Arc<Self>,
|
|
argument: Option<&str>,
|
|
workspace: WeakView<Workspace>,
|
|
_delegate: Option<Arc<dyn LspAdapterDelegate>>,
|
|
cx: &mut WindowContext,
|
|
) -> Task<Result<SlashCommandOutput>> {
|
|
let Some(workspace) = workspace.upgrade() else {
|
|
return Task::ready(Err(anyhow::anyhow!("workspace was dropped")));
|
|
};
|
|
let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
|
|
return Task::ready(Err(anyhow::anyhow!("no terminal panel open")));
|
|
};
|
|
let Some(active_terminal) = terminal_panel.read(cx).pane().and_then(|pane| {
|
|
pane.read(cx)
|
|
.active_item()
|
|
.and_then(|t| t.downcast::<TerminalView>())
|
|
}) else {
|
|
return Task::ready(Err(anyhow::anyhow!("no active terminal")));
|
|
};
|
|
|
|
let line_count = argument
|
|
.and_then(|a| parse_argument(a))
|
|
.unwrap_or(DEFAULT_CONTEXT_LINES);
|
|
|
|
let lines = active_terminal
|
|
.read(cx)
|
|
.model()
|
|
.read(cx)
|
|
.last_n_non_empty_lines(line_count);
|
|
|
|
let mut text = String::new();
|
|
text.push_str("Terminal output:\n");
|
|
text.push_str(&lines.join("\n"));
|
|
let range = 0..text.len();
|
|
|
|
Task::ready(Ok(SlashCommandOutput {
|
|
text,
|
|
sections: vec![SlashCommandOutputSection {
|
|
range,
|
|
icon: IconName::Terminal,
|
|
label: "Terminal".into(),
|
|
}],
|
|
run_commands_in_text: false,
|
|
}))
|
|
}
|
|
}
|
|
|
|
fn parse_argument(argument: &str) -> Option<usize> {
|
|
let mut args = argument.split(' ');
|
|
if args.next() == Some(LINE_COUNT_ARG) {
|
|
if let Some(line_count) = args.next().and_then(|s| s.parse::<usize>().ok()) {
|
|
return Some(line_count);
|
|
}
|
|
}
|
|
None
|
|
}
|