diff --git a/crates/assistant/src/slash_command/auto_command.rs b/crates/assistant/src/slash_command/auto_command.rs index bd08496eaa..aaa7cb5b73 100644 --- a/crates/assistant/src/slash_command/auto_command.rs +++ b/crates/assistant/src/slash_command/auto_command.rs @@ -5,7 +5,7 @@ use assistant_slash_command::{ }; use feature_flags::FeatureFlag; use futures::StreamExt; -use gpui::{AppContext, AsyncAppContext, Task, WeakView}; +use gpui::{AppContext, AsyncAppContext, Task}; use language::{CodeLabel, LspAdapterDelegate}; use language_model::{ LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest, diff --git a/crates/assistant/src/slash_command/cargo_workspace_command.rs b/crates/assistant/src/slash_command/cargo_workspace_command.rs index 2bd5e506d1..5f9dbe930c 100644 --- a/crates/assistant/src/slash_command/cargo_workspace_command.rs +++ b/crates/assistant/src/slash_command/cargo_workspace_command.rs @@ -4,7 +4,7 @@ use assistant_slash_command::{ SlashCommandResult, }; use fs::Fs; -use gpui::{AppContext, Model, Task, WeakView}; +use gpui::{AppContext, Model, Task}; use language::{BufferSnapshot, LspAdapterDelegate}; use project::{Project, ProjectPath}; use std::{ diff --git a/crates/assistant/src/slash_command/context_server_command.rs b/crates/assistant/src/slash_command/context_server_command.rs index 46e47a9fb7..f3317f67b2 100644 --- a/crates/assistant/src/slash_command/context_server_command.rs +++ b/crates/assistant/src/slash_command/context_server_command.rs @@ -8,13 +8,12 @@ use context_servers::{ manager::{ContextServer, ContextServerManager}, types::Prompt, }; -use gpui::{AppContext, Task, WeakView, WindowContext}; +use gpui::{AppContext, Task, WindowContext}; use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate}; use std::sync::atomic::AtomicBool; use std::sync::Arc; use text::LineEnding; use ui::{IconName, SharedString}; -use workspace::Workspace; use crate::slash_command::create_label_for_command; diff --git a/crates/assistant/src/slash_command/default_command.rs b/crates/assistant/src/slash_command/default_command.rs index 823548f403..64c4732db9 100644 --- a/crates/assistant/src/slash_command/default_command.rs +++ b/crates/assistant/src/slash_command/default_command.rs @@ -4,14 +4,13 @@ use assistant_slash_command::{ ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection, SlashCommandResult, }; -use gpui::{Task, WeakView}; +use gpui::Task; use language::{BufferSnapshot, LspAdapterDelegate}; use std::{ fmt::Write, sync::{atomic::AtomicBool, Arc}, }; use ui::prelude::*; -use workspace::Workspace; pub(crate) struct DefaultSlashCommand; diff --git a/crates/assistant/src/slash_command/delta_command.rs b/crates/assistant/src/slash_command/delta_command.rs index e06b14c1fe..fc82a4e163 100644 --- a/crates/assistant/src/slash_command/delta_command.rs +++ b/crates/assistant/src/slash_command/delta_command.rs @@ -6,7 +6,7 @@ use assistant_slash_command::{ }; use collections::HashSet; use futures::future; -use gpui::{Task, WeakView, WindowContext}; +use gpui::{Task, WindowContext}; use language::{BufferSnapshot, LspAdapterDelegate}; use std::sync::{atomic::AtomicBool, Arc}; use text::OffsetRangeExt; diff --git a/crates/assistant/src/slash_command/diagnostics_command.rs b/crates/assistant/src/slash_command/diagnostics_command.rs index dd746eb5bb..bd028c963a 100644 --- a/crates/assistant/src/slash_command/diagnostics_command.rs +++ b/crates/assistant/src/slash_command/diagnostics_command.rs @@ -4,7 +4,7 @@ use assistant_slash_command::{ SlashCommandResult, }; use fuzzy::{PathMatch, StringMatchCandidate}; -use gpui::{AppContext, Model, Task, View, WeakView}; +use gpui::{AppContext, Model, Task, View}; use language::{ Anchor, BufferSnapshot, DiagnosticEntry, DiagnosticSeverity, LspAdapterDelegate, OffsetRangeExt, ToOffset, diff --git a/crates/assistant/src/slash_command/docs_command.rs b/crates/assistant/src/slash_command/docs_command.rs index 76dbb7725b..35eac52589 100644 --- a/crates/assistant/src/slash_command/docs_command.rs +++ b/crates/assistant/src/slash_command/docs_command.rs @@ -8,7 +8,7 @@ use assistant_slash_command::{ ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection, SlashCommandResult, }; -use gpui::{AppContext, BackgroundExecutor, Model, Task, WeakView}; +use gpui::{AppContext, BackgroundExecutor, Model, Task}; use indexed_docs::{ DocsDotRsProvider, IndexedDocsRegistry, IndexedDocsStore, LocalRustdocProvider, PackageName, ProviderId, diff --git a/crates/assistant/src/slash_command/fetch_command.rs b/crates/assistant/src/slash_command/fetch_command.rs index ba173c1860..0b72b7b29e 100644 --- a/crates/assistant/src/slash_command/fetch_command.rs +++ b/crates/assistant/src/slash_command/fetch_command.rs @@ -9,7 +9,7 @@ use assistant_slash_command::{ SlashCommandResult, }; use futures::AsyncReadExt; -use gpui::{Task, WeakView}; +use gpui::Task; use html_to_markdown::{convert_html_to_markdown, markdown, TagHandler}; use http_client::{AsyncBody, HttpClient, HttpClientWithUrl}; use language::{BufferSnapshot, LspAdapterDelegate}; diff --git a/crates/assistant/src/slash_command/file_command.rs b/crates/assistant/src/slash_command/file_command.rs index 485b60c414..d271aa75ac 100644 --- a/crates/assistant/src/slash_command/file_command.rs +++ b/crates/assistant/src/slash_command/file_command.rs @@ -6,7 +6,7 @@ use assistant_slash_command::{ use futures::channel::mpsc; use futures::Stream; use fuzzy::PathMatch; -use gpui::{AppContext, Model, Task, View, WeakView}; +use gpui::{AppContext, Model, Task, View}; use language::{BufferSnapshot, CodeLabel, HighlightId, LineEnding, LspAdapterDelegate}; use project::{PathMatchCandidateSet, Project}; use serde::{Deserialize, Serialize}; diff --git a/crates/assistant/src/slash_command/now_command.rs b/crates/assistant/src/slash_command/now_command.rs index 0f20820c30..99ba16ec94 100644 --- a/crates/assistant/src/slash_command/now_command.rs +++ b/crates/assistant/src/slash_command/now_command.rs @@ -7,10 +7,9 @@ use assistant_slash_command::{ SlashCommandResult, }; use chrono::Local; -use gpui::{Task, WeakView}; +use gpui::Task; use language::{BufferSnapshot, LspAdapterDelegate}; use ui::prelude::*; -use workspace::Workspace; pub(crate) struct NowSlashCommand; diff --git a/crates/assistant/src/slash_command/project_command.rs b/crates/assistant/src/slash_command/project_command.rs index dccaa594fc..843ec90c66 100644 --- a/crates/assistant/src/slash_command/project_command.rs +++ b/crates/assistant/src/slash_command/project_command.rs @@ -6,7 +6,7 @@ use crate::PromptBuilder; use anyhow::{anyhow, Result}; use assistant_slash_command::{ArgumentCompletion, SlashCommandOutputSection, SlashCommandResult}; use feature_flags::FeatureFlag; -use gpui::{AppContext, Task, WeakView, WindowContext}; +use gpui::{AppContext, Task, WindowContext}; use language::{Anchor, CodeLabel, LspAdapterDelegate}; use language_model::{LanguageModelRegistry, LanguageModelTool}; use schemars::JsonSchema; diff --git a/crates/assistant/src/slash_command/prompt_command.rs b/crates/assistant/src/slash_command/prompt_command.rs index 0b93933b47..d0b8a11929 100644 --- a/crates/assistant/src/slash_command/prompt_command.rs +++ b/crates/assistant/src/slash_command/prompt_command.rs @@ -4,11 +4,10 @@ use assistant_slash_command::{ ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection, SlashCommandResult, }; -use gpui::{Task, WeakView}; +use gpui::Task; use language::{BufferSnapshot, LspAdapterDelegate}; use std::sync::{atomic::AtomicBool, Arc}; use ui::prelude::*; -use workspace::Workspace; pub(crate) struct PromptSlashCommand; diff --git a/crates/assistant/src/slash_command/search_command.rs b/crates/assistant/src/slash_command/search_command.rs index 60525925ef..4ce3043511 100644 --- a/crates/assistant/src/slash_command/search_command.rs +++ b/crates/assistant/src/slash_command/search_command.rs @@ -4,7 +4,7 @@ use assistant_slash_command::{ SlashCommandResult, }; use feature_flags::FeatureFlag; -use gpui::{AppContext, Task, WeakView}; +use gpui::{AppContext, Task}; use language::{CodeLabel, LspAdapterDelegate}; use semantic_index::{LoadedSearchResult, SemanticDb}; use std::{ diff --git a/crates/assistant/src/slash_command/symbols_command.rs b/crates/assistant/src/slash_command/symbols_command.rs index 33826bc539..db69d03ee6 100644 --- a/crates/assistant/src/slash_command/symbols_command.rs +++ b/crates/assistant/src/slash_command/symbols_command.rs @@ -4,11 +4,11 @@ use assistant_slash_command::{ SlashCommandResult, }; use editor::Editor; -use gpui::{Task, WeakView}; +use gpui::Task; use language::{BufferSnapshot, LspAdapterDelegate}; use std::sync::Arc; use std::{path::Path, sync::atomic::AtomicBool}; -use ui::{Context, IconName, WindowContext}; +use ui::{IconName, WindowContext}; use workspace::Workspace; pub(crate) struct OutlineSlashCommand; diff --git a/crates/assistant/src/slash_command/tab_command.rs b/crates/assistant/src/slash_command/tab_command.rs index 41aee7547a..f65db7f463 100644 --- a/crates/assistant/src/slash_command/tab_command.rs +++ b/crates/assistant/src/slash_command/tab_command.rs @@ -6,7 +6,7 @@ use assistant_slash_command::{ use collections::{HashMap, HashSet}; use editor::Editor; use futures::future::join_all; -use gpui::{Entity, Task, WeakView}; +use gpui::{Entity, Task}; use language::{BufferSnapshot, CodeLabel, HighlightId, LspAdapterDelegate}; use std::{ path::PathBuf, diff --git a/crates/assistant/src/slash_command/terminal_command.rs b/crates/assistant/src/slash_command/terminal_command.rs index a301a78a85..6ade55e2d2 100644 --- a/crates/assistant/src/slash_command/terminal_command.rs +++ b/crates/assistant/src/slash_command/terminal_command.rs @@ -6,7 +6,7 @@ use assistant_slash_command::{ ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection, SlashCommandResult, }; -use gpui::{AppContext, Task, View, WeakView}; +use gpui::{AppContext, Task, View}; use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate}; use terminal_view::{terminal_panel::TerminalPanel, TerminalView}; use ui::prelude::*; diff --git a/crates/extension/src/extension_slash_command.rs b/crates/extension/src/extension_slash_command.rs index 5fc3779398..8b405af1f0 100644 --- a/crates/extension/src/extension_slash_command.rs +++ b/crates/extension/src/extension_slash_command.rs @@ -6,11 +6,10 @@ use assistant_slash_command::{ SlashCommandResult, }; use futures::FutureExt; -use gpui::{Task, WeakView, WindowContext}; +use gpui::{Task, WindowContext}; use language::{BufferSnapshot, LspAdapterDelegate}; use ui::prelude::*; use wasmtime_wasi::WasiView; -use workspace::Workspace; use crate::wasm_host::{WasmExtension, WasmHost};