assistant: Show an indicator when a crate is being indexed (#13174)

This PR adds an indicator when a crate is being indexed as part of the
`/rustdoc` command invocation.


https://github.com/zed-industries/zed/assets/1486634/0dd4b663-658c-4be5-a342-cfbd7a938fca

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-06-17 17:39:38 -04:00 committed by GitHub
parent 7aa28c9b24
commit 59104a08fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 60 additions and 7 deletions

View File

@ -28,11 +28,12 @@ use fs::Fs;
use futures::future::Shared; use futures::future::Shared;
use futures::{FutureExt, StreamExt}; use futures::{FutureExt, StreamExt};
use gpui::{ use gpui::{
div, point, rems, Action, AnyElement, AnyView, AppContext, AsyncAppContext, AsyncWindowContext, div, percentage, point, rems, Action, Animation, AnimationExt, AnyElement, AnyView, AppContext,
ClipboardItem, Context as _, Empty, EventEmitter, FocusHandle, FocusOutEvent, FocusableView, AsyncAppContext, AsyncWindowContext, ClipboardItem, Context as _, Empty, EventEmitter,
InteractiveElement, IntoElement, Model, ModelContext, ParentElement, Pixels, Render, FocusHandle, FocusOutEvent, FocusableView, InteractiveElement, IntoElement, Model,
SharedString, StatefulInteractiveElement, Styled, Subscription, Task, UpdateGlobal, View, ModelContext, ParentElement, Pixels, Render, SharedString, StatefulInteractiveElement, Styled,
ViewContext, VisualContext, WeakView, WindowContext, Subscription, Task, Transformation, UpdateGlobal, View, ViewContext, VisualContext, WeakView,
WindowContext,
}; };
use language::{ use language::{
language_settings::SoftWrap, AnchorRangeExt, AutoindentMode, Buffer, LanguageRegistry, language_settings::SoftWrap, AnchorRangeExt, AutoindentMode, Buffer, LanguageRegistry,
@ -41,6 +42,7 @@ use language::{
use multi_buffer::MultiBufferRow; use multi_buffer::MultiBufferRow;
use picker::{Picker, PickerDelegate}; use picker::{Picker, PickerDelegate};
use project::{Project, ProjectLspAdapterDelegate, ProjectTransaction}; use project::{Project, ProjectLspAdapterDelegate, ProjectTransaction};
use rustdoc::{CrateName, RustdocStore};
use search::{buffer_search::DivRegistrar, BufferSearchBar}; use search::{buffer_search::DivRegistrar, BufferSearchBar};
use settings::Settings; use settings::Settings;
use std::{ use std::{
@ -2537,8 +2539,23 @@ impl ContextEditor {
) )
} }
}; };
let render_trailer = let render_trailer = {
|_row, _unfold, _cx: &mut WindowContext| Empty.into_any(); let command = command.clone();
move |row, _unfold, cx: &mut WindowContext| {
// TODO: In the future we should investigate how we can expose
// this as a hook on the `SlashCommand` trait so that we don't
// need to special-case it here.
if command.name == "rustdoc" {
return render_rustdoc_slash_command_trailer(
row,
command.clone(),
cx,
);
}
Empty.into_any()
}
};
let start = buffer let start = buffer
.anchor_in_excerpt(excerpt_id, command.source_range.start) .anchor_in_excerpt(excerpt_id, command.source_range.start)
@ -3168,6 +3185,37 @@ fn render_pending_slash_command_gutter_decoration(
icon.into_any_element() icon.into_any_element()
} }
fn render_rustdoc_slash_command_trailer(
row: MultiBufferRow,
command: PendingSlashCommand,
cx: &mut WindowContext,
) -> AnyElement {
let rustdoc_store = RustdocStore::global(cx);
let Some((crate_name, _)) = command
.argument
.as_ref()
.and_then(|arg| arg.split_once(':'))
else {
return Empty.into_any();
};
let crate_name = CrateName::from(crate_name);
if !rustdoc_store.is_indexing(&crate_name) {
return Empty.into_any();
}
div()
.id(("crates-being-indexed", row.0))
.child(Icon::new(IconName::ArrowCircle).with_animation(
"arrow-circle",
Animation::new(Duration::from_secs(4)).repeat(),
|icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
))
.tooltip(move |cx| Tooltip::text(format!("Indexing {crate_name}"), cx))
.into_any_element()
}
fn make_lsp_adapter_delegate( fn make_lsp_adapter_delegate(
project: &Model<Project>, project: &Model<Project>,
cx: &mut AppContext, cx: &mut AppContext,

View File

@ -71,6 +71,11 @@ impl RustdocStore {
} }
} }
/// Returns whether the crate with the given name is currently being indexed.
pub fn is_indexing(&self, crate_name: &CrateName) -> bool {
self.indexing_tasks_by_crate.read().contains_key(crate_name)
}
pub async fn load( pub async fn load(
&self, &self,
crate_name: CrateName, crate_name: CrateName,