Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Merge gpui::Task and scheduler::Task (#53674)
Conrad Irwinbe705e677bc1
diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rsindex 1a7aaffb580..95b79a0cc15 100644--- a/crates/agent/src/agent.rs+++ b/crates/agent/src/agent.rs@@ -37,7 +37,7 @@ use futures::future::Shared;use futures::{FutureExt as _, StreamExt as _, future};use gpui::{App, AppContext, AsyncApp, Context, Entity, EntityId, SharedString, Subscription, Task,- WeakEntity,+ TaskExt, WeakEntity,};use language_model::{IconOrSvg, LanguageModel, LanguageModelProvider, LanguageModelRegistry};use project::{AgentId, Project, ProjectItem, ProjectPath, Worktree};diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rsindex da0704889e7..39b1302555b 100644--- a/crates/agent_ui/src/agent_configuration.rs+++ b/crates/agent_ui/src/agent_configuration.rs@@ -17,7 +17,7 @@ use extension_host::ExtensionStore;use fs::Fs;use gpui::{Action, Anchor, AnyView, App, AsyncWindowContext, Entity, EventEmitter, FocusHandle, Focusable,- ScrollHandle, Subscription, Task, WeakEntity,+ ScrollHandle, Subscription, Task, TaskExt, WeakEntity,};use itertools::Itertools;use language::LanguageRegistry;diff --git a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rsindex 1cff19c7cf4..8eeda6447e8 100644--- a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs+++ b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs@@ -4,7 +4,7 @@ use anyhow::Result;use collections::HashSet;use fs::Fs;use gpui::{- DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Render, ScrollHandle, Task,+ DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Render, ScrollHandle, Task, TaskExt,};use language_model::LanguageModelRegistry;use language_models::provider::open_ai_compatible::{AvailableModel, ModelCapabilities};diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rsindex 465d31b416e..48d01e506bf 100644--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs@@ -5,7 +5,8 @@ use editor::{Editor, EditorElement, EditorStyle};use gpui::{AsyncWindowContext, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, ScrollHandle,- Subscription, Task, TextStyle, TextStyleRefinement, UnderlineStyle, WeakEntity, prelude::*,+ Subscription, Task, TaskExt, TextStyle, TextStyleRefinement, UnderlineStyle, WeakEntity,+ prelude::*,};use language::{Language, LanguageRegistry};use markdown::{Markdown, MarkdownElement, MarkdownStyle};diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rsindex 4a5771fd981..6f4e900be42 100644--- a/crates/agent_ui/src/agent_diff.rs+++ b/crates/agent_ui/src/agent_diff.rs@@ -15,7 +15,7 @@ use editor::{use gpui::{Action, AnyElement, App, AppContext, Empty, Entity, EventEmitter, FocusHandle, Focusable,- Global, SharedString, Subscription, Task, WeakEntity, Window, prelude::*,+ Global, SharedString, Subscription, Task, TaskExt, WeakEntity, Window, prelude::*,};use language::{Buffer, Capability, OffsetRangeExt, Point};diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rsindex 8285da9e113..921d1347ffb 100644--- a/crates/agent_ui/src/agent_panel.rs+++ b/crates/agent_ui/src/agent_panel.rs@@ -60,7 +60,7 @@ use fs::Fs;use gpui::{Action, Anchor, Animation, AnimationExt, AnyElement, App, AsyncWindowContext, ClipboardItem,Entity, EventEmitter, ExternalPaths, FocusHandle, Focusable, KeyContext, Pixels, Subscription,- Task, UpdateGlobal, WeakEntity, prelude::*, pulsating_between,+ Task, TaskExt, UpdateGlobal, WeakEntity, prelude::*, pulsating_between,};use language::LanguageRegistry;use language_model::LanguageModelRegistry;diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rsindex c01d8d8c04c..9dd97975a18 100644--- a/crates/agent_ui/src/conversation_view.rs+++ b/crates/agent_ui/src/conversation_view.rs@@ -31,7 +31,7 @@ use futures::FutureExt as _;use gpui::{Action, Animation, AnimationExt, AnyView, App, ClickEvent, ClipboardItem, CursorStyle,ElementId, Empty, Entity, EventEmitter, FocusHandle, Focusable, Hsla, ListOffset, ListState,- ObjectFit, PlatformDisplay, ScrollHandle, SharedString, Subscription, Task, TextStyle,+ ObjectFit, PlatformDisplay, ScrollHandle, SharedString, Subscription, Task, TaskExt, TextStyle,WeakEntity, Window, WindowHandle, div, ease_in_out, img, linear_color_stop, linear_gradient,list, point, pulsating_between,};diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rsindex 0e0b3d04a8d..c8971392941 100644--- a/crates/agent_ui/src/conversation_view/thread_view.rs+++ b/crates/agent_ui/src/conversation_view/thread_view.rs@@ -13,6 +13,7 @@ use feature_flags::AcpBetaFeatureFlag;use crate::message_editor::SharedSessionCapabilities;use gpui::List;+use gpui::TaskExt;use heapless::Vec as ArrayVec;use language_model::{LanguageModelEffortLevel, Speed};use settings::{SidebarSide, update_settings_file};diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rsindex d442a61e01a..b13a9b615b6 100644--- a/crates/agent_ui/src/inline_assistant.rs+++ b/crates/agent_ui/src/inline_assistant.rs@@ -35,8 +35,8 @@ use editor::{use fs::Fs;use futures::{FutureExt, channel::mpsc};use gpui::{- App, Context, Entity, Focusable, Global, HighlightStyle, Subscription, Task, UpdateGlobal,- WeakEntity, Window, point,+ App, Context, Entity, Focusable, Global, HighlightStyle, Subscription, Task, TaskExt,+ UpdateGlobal, WeakEntity, Window, point,};use language::{Buffer, Point, Selection, TransactionId};use language_model::{ConfigurationError, ConfiguredModel, LanguageModelRegistry};diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rsindex d839e87d98e..16f69b297cf 100644--- a/crates/agent_ui/src/message_editor.rs+++ b/crates/agent_ui/src/message_editor.rs@@ -22,7 +22,8 @@ use editor::{use futures::{FutureExt as _, future::join_all};use gpui::{AppContext, ClipboardEntry, ClipboardItem, Context, Entity, EventEmitter, FocusHandle,- Focusable, ImageFormat, KeyContext, SharedString, Subscription, Task, TextStyle, WeakEntity,+ Focusable, ImageFormat, KeyContext, SharedString, Subscription, Task, TaskExt, TextStyle,+ WeakEntity,};use language::{Buffer, language_settings::InlayHintKind};use parking_lot::RwLock;diff --git a/crates/agent_ui/src/model_selector.rs b/crates/agent_ui/src/model_selector.rsindex e1cf7307394..47171979496 100644--- a/crates/agent_ui/src/model_selector.rs+++ b/crates/agent_ui/src/model_selector.rs@@ -11,7 +11,7 @@ use futures::FutureExt;use fuzzy::{StringMatchCandidate, match_strings};use gpui::{Action, AsyncWindowContext, BackgroundExecutor, DismissEvent, FocusHandle, Subscription, Task,- WeakEntity,+ TaskExt, WeakEntity,};use itertools::Itertools;use ordered_float::OrderedFloat;diff --git a/crates/agent_ui/src/thread_import.rs b/crates/agent_ui/src/thread_import.rsindex f5d6fa1a657..1bee86602ed 100644--- a/crates/agent_ui/src/thread_import.rs+++ b/crates/agent_ui/src/thread_import.rs@@ -9,7 +9,7 @@ use fs::Fs;use futures::FutureExt as _;use gpui::{App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent,- Render, SharedString, Task, WeakEntity, Window,+ Render, SharedString, Task, TaskExt, WeakEntity, Window,};use itertools::Itertools as _;use notifications::status_toast::StatusToast;diff --git a/crates/agent_ui/src/thread_metadata_store.rs b/crates/agent_ui/src/thread_metadata_store.rsindex 2e6c3313eba..00d132f5a36 100644--- a/crates/agent_ui/src/thread_metadata_store.rs+++ b/crates/agent_ui/src/thread_metadata_store.rs@@ -20,7 +20,7 @@ use db::{};use fs::Fs;use futures::{FutureExt, future::Shared};-use gpui::{AppContext as _, Entity, Global, Subscription, Task};+use gpui::{AppContext as _, Entity, Global, Subscription, Task, TaskExt};pub use project::WorktreePaths;use project::{AgentId, linked_worktree_short_name};use remote::{RemoteConnectionOptions, same_remote_connection_identity};diff --git a/crates/agent_ui/src/threads_archive_view.rs b/crates/agent_ui/src/threads_archive_view.rsindex 82836928876..5da5526b3df 100644--- a/crates/agent_ui/src/threads_archive_view.rs+++ b/crates/agent_ui/src/threads_archive_view.rs@@ -19,7 +19,8 @@ use fs::Fs;use fuzzy::{StringMatch, StringMatchCandidate};use gpui::{AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,- ListState, Render, SharedString, Subscription, Task, WeakEntity, Window, list, prelude::*, px,+ ListState, Render, SharedString, Subscription, Task, TaskExt, WeakEntity, Window, list,+ prelude::*, px,};use itertools::Itertools as _;use menu::{Confirm, SelectFirst, SelectLast, SelectNext, SelectPrevious};diff --git a/crates/agent_ui/src/ui/mention_crease.rs b/crates/agent_ui/src/ui/mention_crease.rsindex e3059ab8724..236e57ddffb 100644--- a/crates/agent_ui/src/ui/mention_crease.rs+++ b/crates/agent_ui/src/ui/mention_crease.rs@@ -4,7 +4,8 @@ use acp_thread::MentionUri;use agent_client_protocol::schema as acp;use editor::{Editor, SelectionEffects, scroll::Autoscroll};use gpui::{- Animation, AnimationExt, AnyView, Context, IntoElement, WeakEntity, Window, pulsating_between,+ Animation, AnimationExt, AnyView, Context, IntoElement, TaskExt, WeakEntity, Window,+ pulsating_between,};use prompt_store::PromptId;use rope::Point;diff --git a/crates/ai_onboarding/src/ai_onboarding.rs b/crates/ai_onboarding/src/ai_onboarding.rsindex 14745892304..bc1dabefd28 100644--- a/crates/ai_onboarding/src/ai_onboarding.rs+++ b/crates/ai_onboarding/src/ai_onboarding.rs@@ -16,7 +16,7 @@ pub use young_account_banner::YoungAccountBanner;use std::sync::Arc;use client::{Client, UserStore, zed_urls};-use gpui::{AnyElement, Entity, IntoElement, ParentElement};+use gpui::{AnyElement, Entity, IntoElement, ParentElement, TaskExt};use ui::{Divider, RegisterComponent, Tooltip, Vector, VectorName, prelude::*};#[derive(PartialEq)]diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rsindex a057a30c6d3..c1b15aa3b6c 100644--- a/crates/auto_update/src/auto_update.rs+++ b/crates/auto_update/src/auto_update.rs@@ -3,8 +3,8 @@ use client::Client;use db::kvp::KeyValueStore;use futures_lite::StreamExt;use gpui::{- App, AppContext as _, AsyncApp, BackgroundExecutor, Context, Entity, Global, Task, Window,- actions,+ App, AppContext as _, AsyncApp, BackgroundExecutor, Context, Entity, Global, Task, TaskExt,+ Window, actions,};use http_client::{HttpClient, HttpClientWithUrl};use paths::remote_servers_dir;diff --git a/crates/auto_update_ui/src/auto_update_ui.rs b/crates/auto_update_ui/src/auto_update_ui.rsindex 77ba83597ed..6bd577ddb1b 100644--- a/crates/auto_update_ui/src/auto_update_ui.rs+++ b/crates/auto_update_ui/src/auto_update_ui.rs@@ -6,7 +6,8 @@ use db::kvp::Dismissable;use editor::{Editor, MultiBuffer};use fs::Fs;use gpui::{- App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Window, actions, prelude::*,+ App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, TaskExt, Window, actions,+ prelude::*,};use markdown_preview::markdown_preview_view::{MarkdownPreviewMode, MarkdownPreviewView};use notifications::status_toast::StatusToast;diff --git a/crates/call/src/call_impl/mod.rs b/crates/call/src/call_impl/mod.rsindex c0c1535cd45..eabc214b115 100644--- a/crates/call/src/call_impl/mod.rs+++ b/crates/call/src/call_impl/mod.rs@@ -9,7 +9,7 @@ use collections::HashSet;use futures::{Future, FutureExt, channel::oneshot, future::Shared};use gpui::{AnyView, App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Subscription, Task,- WeakEntity, Window,+ TaskExt, WeakEntity, Window,};use postage::watch;use project::Project;diff --git a/crates/call/src/call_impl/room.rs b/crates/call/src/call_impl/room.rsindex f9df2b758f7..658c2b62064 100644--- a/crates/call/src/call_impl/room.rs+++ b/crates/call/src/call_impl/room.rs@@ -14,7 +14,7 @@ use fs::Fs;use futures::StreamExt;use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, FutureExt as _,- ScreenCaptureSource, ScreenCaptureStream, Task, Timeout, WeakEntity,+ ScreenCaptureSource, ScreenCaptureStream, Task, TaskExt, Timeout, WeakEntity,};use gpui_tokio::Tokio;use language::LanguageRegistry;diff --git a/crates/client/src/client.rs b/crates/client/src/client.rsindex 5bc34320a87..fc3c5126774 100644--- a/crates/client/src/client.rs+++ b/crates/client/src/client.rs@@ -26,7 +26,7 @@ use futures::{future::BoxFuture,stream::BoxStream,};-use gpui::{App, AsyncApp, Entity, Global, Task, WeakEntity, actions};+use gpui::{App, AsyncApp, Entity, Global, Task, TaskExt, WeakEntity, actions};use http_client::{HttpClient, HttpClientWithUrl, http, read_proxy_from_env};use parking_lot::{Mutex, RwLock};use postage::watch;diff --git a/crates/client/src/llm_token.rs b/crates/client/src/llm_token.rsindex 70457679e4b..058be7905fa 100644--- a/crates/client/src/llm_token.rs+++ b/crates/client/src/llm_token.rs@@ -4,6 +4,7 @@ use cloud_api_types::websocket_protocol::MessageToClient;use cloud_llm_client::{EXPIRED_LLM_TOKEN_HEADER_NAME, OUTDATED_LLM_TOKEN_HEADER_NAME};use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Global, ReadGlobal as _, Subscription,+ TaskExt,};use std::sync::Arc;diff --git a/crates/client/src/user.rs b/crates/client/src/user.rsindex 0f436904913..3673393631d 100644--- a/crates/client/src/user.rs+++ b/crates/client/src/user.rs@@ -15,7 +15,8 @@ use derive_more::Deref;use feature_flags::FeatureFlagAppExt;use futures::{Future, StreamExt, channel::mpsc};use gpui::{- App, AsyncApp, Context, Entity, EventEmitter, SharedString, SharedUri, Task, WeakEntity,+ App, AsyncApp, Context, Entity, EventEmitter, SharedString, SharedUri, Task, TaskExt,+ WeakEntity,};use http_client::http::{HeaderMap, HeaderValue};use postage::{sink::Sink, watch};diff --git a/crates/collab/tests/integration/random_project_collaboration_tests.rs b/crates/collab/tests/integration/random_project_collaboration_tests.rsindex ab5bde6d321..a7eaa9cd60f 100644--- a/crates/collab/tests/integration/random_project_collaboration_tests.rs+++ b/crates/collab/tests/integration/random_project_collaboration_tests.rs@@ -7,7 +7,7 @@ use collections::{BTreeMap, HashMap};use editor::Bias;use fs::{FakeFs, Fs as _};use git::status::{FileStatus, StatusCode, TrackedStatus, UnmergedStatus, UnmergedStatusCode};-use gpui::{BackgroundExecutor, Entity, TestAppContext};+use gpui::{BackgroundExecutor, Entity, TaskExt, TestAppContext};use language::{FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, PointUtf16, range_to_lsp,};diff --git a/crates/collab_ui/src/collab_panel/channel_modal.rs b/crates/collab_ui/src/collab_panel/channel_modal.rsindex 1781a8e93e0..befe7703e65 100644--- a/crates/collab_ui/src/collab_panel/channel_modal.rs+++ b/crates/collab_ui/src/collab_panel/channel_modal.rs@@ -6,7 +6,8 @@ use client::{use fuzzy::{StringMatchCandidate, match_strings};use gpui::{App, ClipboardItem, Context, DismissEvent, Entity, EventEmitter, Focusable, ParentElement,- Render, Styled, Subscription, Task, WeakEntity, Window, actions, anchored, deferred, div,+ Render, Styled, Subscription, Task, TaskExt, WeakEntity, Window, actions, anchored, deferred,+ div,};use picker::{Picker, PickerDelegate};use std::sync::Arc;diff --git a/crates/collab_ui/src/notifications/incoming_call_notification.rs b/crates/collab_ui/src/notifications/incoming_call_notification.rsindex 71940794f41..5a9628ac87d 100644--- a/crates/collab_ui/src/notifications/incoming_call_notification.rs+++ b/crates/collab_ui/src/notifications/incoming_call_notification.rs@@ -1,7 +1,7 @@use crate::notification_window_options;use call::{ActiveCall, IncomingCall};use futures::StreamExt;-use gpui::{App, WindowHandle, prelude::*};+use gpui::{App, TaskExt, WindowHandle, prelude::*};use std::sync::{Arc, Weak};use ui::{CollabNotification, prelude::*};diff --git a/crates/collab_ui/src/notifications/project_shared_notification.rs b/crates/collab_ui/src/notifications/project_shared_notification.rsindex 3c231c5397a..e39d1cd32a5 100644--- a/crates/collab_ui/src/notifications/project_shared_notification.rs+++ b/crates/collab_ui/src/notifications/project_shared_notification.rs@@ -2,7 +2,7 @@ use crate::notification_window_options;use call::{ActiveCall, room};use client::User;use collections::HashMap;-use gpui::{App, Size};+use gpui::{App, Size, TaskExt};use std::sync::{Arc, Weak};use ui::{CollabNotification, prelude::*};diff --git a/crates/command_palette/src/command_palette.rs b/crates/command_palette/src/command_palette.rsindex 68d04537a02..35af6f071be 100644--- a/crates/command_palette/src/command_palette.rs+++ b/crates/command_palette/src/command_palette.rs@@ -16,7 +16,7 @@ use command_palette_hooks::{use fuzzy_nucleo::{StringMatch, StringMatchCandidate};use gpui::{Action, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,- ParentElement, Render, Styled, Task, WeakEntity, Window,+ ParentElement, Render, Styled, Task, TaskExt, WeakEntity, Window,};use persistence::CommandPaletteDB;use picker::Direction;diff --git a/crates/copilot/src/copilot_edit_prediction_delegate.rs b/crates/copilot/src/copilot_edit_prediction_delegate.rsindex e789a89df65..4b75feafe4b 100644--- a/crates/copilot/src/copilot_edit_prediction_delegate.rs+++ b/crates/copilot/src/copilot_edit_prediction_delegate.rs@@ -10,7 +10,7 @@ use edit_prediction_types::{EditPrediction, EditPredictionDelegate, EditPredictionDiscardReason, EditPredictionIconSet,interpolate_edits,};-use gpui::{App, Context, Entity, Task};+use gpui::{App, Context, Entity, Task, TaskExt};use icons::IconName;use language::{Anchor, Buffer, BufferSnapshot, EditPreview, OffsetRangeExt, ToPointUtf16};use std::{ops::Range, sync::Arc, time::Duration};diff --git a/crates/copilot_chat/src/copilot_chat.rs b/crates/copilot_chat/src/copilot_chat.rsindex fb89c2e0853..ab5c08b6174 100644--- a/crates/copilot_chat/src/copilot_chat.rs+++ b/crates/copilot_chat/src/copilot_chat.rs@@ -9,6 +9,7 @@ use anyhow::{Result, anyhow};use collections::HashSet;use fs::Fs;use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};+use gpui::TaskExt;use gpui::WeakEntity;use gpui::{App, AsyncApp, Global, prelude::*};use http_client::HttpRequestExt;diff --git a/crates/copilot_ui/src/sign_in.rs b/crates/copilot_ui/src/sign_in.rsindex 09267020e5c..f0408ea063a 100644--- a/crates/copilot_ui/src/sign_in.rs+++ b/crates/copilot_ui/src/sign_in.rs@@ -6,7 +6,7 @@ use copilot::{use gpui::{App, ClipboardItem, Context, DismissEvent, Element, Entity, EventEmitter, FocusHandle,Focusable, InteractiveElement, IntoElement, MouseDownEvent, ParentElement, Render, Styled,- Subscription, Window, WindowBounds, WindowOptions, div, point,+ Subscription, TaskExt, Window, WindowBounds, WindowOptions, div, point,};use project::project_settings::ProjectSettings;use settings::Settings as _;diff --git a/crates/debugger_tools/src/dap_log.rs b/crates/debugger_tools/src/dap_log.rsindex 749a6cd7888..76d31bdd232 100644--- a/crates/debugger_tools/src/dap_log.rs+++ b/crates/debugger_tools/src/dap_log.rs@@ -11,7 +11,8 @@ use futures::{};use gpui::{App, AppContext, Context, Empty, Entity, EventEmitter, FocusHandle, Focusable, IntoElement,- ParentElement, Render, SharedString, Styled, Subscription, WeakEntity, Window, actions, div,+ ParentElement, Render, SharedString, Styled, Subscription, TaskExt, WeakEntity, Window,+ actions, div,};use project::{Project,diff --git a/crates/debugger_ui/src/attach_modal.rs b/crates/debugger_ui/src/attach_modal.rsindex 6e537ae0c6e..5f07f2a70d2 100644--- a/crates/debugger_ui/src/attach_modal.rs+++ b/crates/debugger_ui/src/attach_modal.rs@@ -1,7 +1,7 @@use dap::{DapRegistry, DebugRequest};use futures::channel::oneshot;use fuzzy::{StringMatch, StringMatchCandidate};-use gpui::{AppContext, DismissEvent, Entity, EventEmitter, Focusable, Render, Task};+use gpui::{AppContext, DismissEvent, Entity, EventEmitter, Focusable, Render, Task, TaskExt};use gpui::{Subscription, WeakEntity};use picker::{Picker, PickerDelegate};use project::Project;diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rsindex f92b87a773c..36327d7695c 100644--- a/crates/debugger_ui/src/debugger_panel.rs+++ b/crates/debugger_ui/src/debugger_panel.rs@@ -19,7 +19,7 @@ use feature_flags::{FeatureFlag, FeatureFlagAppExt as _, PresenceFlag, register_use gpui::{Action, Anchor, App, AsyncWindowContext, ClipboardItem, Context, DismissEvent, Entity,EntityId, EventEmitter, FocusHandle, Focusable, MouseButton, MouseDownEvent, Point,- Subscription, Task, WeakEntity, anchored, deferred,+ Subscription, Task, TaskExt, WeakEntity, anchored, deferred,};use itertools::Itertools as _;diff --git a/crates/debugger_ui/src/debugger_ui.rs b/crates/debugger_ui/src/debugger_ui.rsindex f5947a4393b..2fe87d1ef00 100644--- a/crates/debugger_ui/src/debugger_ui.rs+++ b/crates/debugger_ui/src/debugger_ui.rs@@ -2,7 +2,7 @@ use std::any::TypeId;use debugger_panel::DebugPanel;use editor::{Editor, MultiBufferOffsetUtf16};-use gpui::{Action, App, DispatchPhase, EntityInputHandler, actions};+use gpui::{Action, App, DispatchPhase, EntityInputHandler, TaskExt, actions};use new_process_modal::{NewProcessModal, NewProcessMode};use project::debugger::{self, breakpoint_store::SourceBreakpoint, session::ThreadStatus};use schemars::JsonSchema;diff --git a/crates/debugger_ui/src/new_process_modal.rs b/crates/debugger_ui/src/new_process_modal.rsindex f0d243995f6..6c1fe4c45b4 100644--- a/crates/debugger_ui/src/new_process_modal.rs+++ b/crates/debugger_ui/src/new_process_modal.rs@@ -16,7 +16,7 @@ use editor::Editor;use fuzzy::{StringMatch, StringMatchCandidate};use gpui::{Action, App, AppContext, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,- KeyContext, Render, Subscription, Task, WeakEntity, actions,+ KeyContext, Render, Subscription, Task, TaskExt, WeakEntity, actions,};use itertools::Itertools as _;use picker::{Picker, PickerDelegate, highlighted_match_with_paths::HighlightedMatch};diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rsindex c496aa193a9..a964eb389f6 100644--- a/crates/debugger_ui/src/session/running.rs+++ b/crates/debugger_ui/src/session/running.rs@@ -33,7 +33,7 @@ use dap::{use futures::{SinkExt, channel::mpsc};use gpui::{Action as _, AnyView, AppContext, Axis, Entity, EntityId, EventEmitter, FocusHandle, Focusable,- NoAction, Pixels, Point, Subscription, Task, WeakEntity,+ NoAction, Pixels, Point, Subscription, Task, TaskExt, WeakEntity,};use language::Buffer;use loaded_source_list::LoadedSourceList;diff --git a/crates/debugger_ui/src/session/running/stack_frame_list.rs b/crates/debugger_ui/src/session/running/stack_frame_list.rsindex 7175b8556a4..982fc0f8567 100644--- a/crates/debugger_ui/src/session/running/stack_frame_list.rs+++ b/crates/debugger_ui/src/session/running/stack_frame_list.rs@@ -8,7 +8,7 @@ use dap::adapters::DebugAdapterName;use db::kvp::KeyValueStore;use gpui::{Action, AnyElement, Entity, EventEmitter, FocusHandle, Focusable, FontWeight, ListState,- Subscription, Task, WeakEntity, list,+ Subscription, Task, TaskExt, WeakEntity, list,};use util::{debug_panic,diff --git a/crates/debugger_ui/src/session/running/variable_list.rs b/crates/debugger_ui/src/session/running/variable_list.rsindex 991961f627c..4f39ae49db9 100644--- a/crates/debugger_ui/src/session/running/variable_list.rs+++ b/crates/debugger_ui/src/session/running/variable_list.rs@@ -8,8 +8,9 @@ use dap::{use editor::Editor;use gpui::{Action, AnyElement, ClickEvent, ClipboardItem, Context, DismissEvent, Empty, Entity,- FocusHandle, Focusable, Hsla, MouseDownEvent, Point, Subscription, TextStyleRefinement,- UniformListScrollHandle, WeakEntity, actions, anchored, deferred, uniform_list,+ FocusHandle, Focusable, Hsla, MouseDownEvent, Point, Subscription, TaskExt,+ TextStyleRefinement, UniformListScrollHandle, WeakEntity, actions, anchored, deferred,+ uniform_list,};use itertools::Itertools;use menu::{SelectFirst, SelectLast, SelectNext, SelectPrevious};diff --git a/crates/diagnostics/src/buffer_diagnostics.rs b/crates/diagnostics/src/buffer_diagnostics.rsindex e703e193c31..b05e6a0f438 100644--- a/crates/diagnostics/src/buffer_diagnostics.rs+++ b/crates/diagnostics/src/buffer_diagnostics.rs@@ -13,7 +13,7 @@ use editor::{use gpui::{AnyElement, App, AppContext, Context, Entity, EntityId, EventEmitter, FocusHandle, Focusable,InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled, Subscription,- Task, WeakEntity, Window, actions, div,+ Task, TaskExt, WeakEntity, Window, actions, div,};use language::{Buffer, Capability, DiagnosticEntry, DiagnosticEntryRef, Point};use project::{diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rsindex 6c98e296ef4..e61cafa6adc 100644--- a/crates/edit_prediction/src/edit_prediction.rs+++ b/crates/edit_prediction/src/edit_prediction.rs@@ -24,6 +24,7 @@ use futures::{select_biased,};use gpui::BackgroundExecutor;+use gpui::TaskExt;use gpui::http_client::Url;use gpui::{App, AsyncApp, Entity, EntityId, Global, SharedString, Task, WeakEntity, actions,diff --git a/crates/edit_prediction/src/mercury.rs b/crates/edit_prediction/src/mercury.rsindex 8e9dfa6cee3..492071f7c7b 100644--- a/crates/edit_prediction/src/mercury.rs+++ b/crates/edit_prediction/src/mercury.rs@@ -8,7 +8,7 @@ use cloud_llm_client::EditPredictionRejectReason;use credentials_provider::CredentialsProvider;use futures::AsyncReadExt as _;use gpui::{- App, AppContext as _, Context, Entity, Global, SharedString, Task,+ App, AppContext as _, Context, Entity, Global, SharedString, Task, TaskExt,http_client::{self, AsyncBody, HttpClient, Method, StatusCode},};use language::{ToOffset, ToPoint as _};diff --git a/crates/edit_prediction/src/ollama.rs b/crates/edit_prediction/src/ollama.rsindex 0ae90dd9f6e..fc0f36d8321 100644--- a/crates/edit_prediction/src/ollama.rs+++ b/crates/edit_prediction/src/ollama.rs@@ -1,7 +1,7 @@use anyhow::{Context as _, Result};use futures::AsyncReadExt as _;use gpui::{- App, SharedString,+ App, SharedString, TaskExt,http_client::{self, HttpClient},};use language::language_settings::OpenAiCompatibleEditPredictionSettings;diff --git a/crates/edit_prediction/src/zeta.rs b/crates/edit_prediction/src/zeta.rsindex c2e622ea010..7f9f1288470 100644--- a/crates/edit_prediction/src/zeta.rs+++ b/crates/edit_prediction/src/zeta.rs@@ -10,7 +10,7 @@ use cloud_llm_client::{AcceptEditPredictionBody, EditPredictionRejectReason, predict_edits_v3::RawCompletionRequest,};use edit_prediction_types::PredictedCursorPosition;-use gpui::{App, AppContext as _, Entity, Task, WeakEntity, prelude::*};+use gpui::{App, AppContext as _, Entity, Task, TaskExt, WeakEntity, prelude::*};use language::{Buffer, BufferSnapshot, DiagnosticSeverity, OffsetRangeExt as _, ToOffset as _,language_settings::all_language_settings, text_diff,diff --git a/crates/edit_prediction_context/src/edit_prediction_context.rs b/crates/edit_prediction_context/src/edit_prediction_context.rsindex bbd12dec4e3..a5dd0c15783 100644--- a/crates/edit_prediction_context/src/edit_prediction_context.rs+++ b/crates/edit_prediction_context/src/edit_prediction_context.rs@@ -2,7 +2,9 @@ use crate::assemble_excerpts::assemble_excerpt_ranges;use anyhow::Result;use collections::HashMap;use futures::{FutureExt, StreamExt as _, channel::mpsc, future};-use gpui::{App, AppContext, AsyncApp, Context, Entity, EntityId, EventEmitter, Task, WeakEntity};+use gpui::{+ App, AppContext, AsyncApp, Context, Entity, EntityId, EventEmitter, Task, TaskExt, WeakEntity,+};use language::{Anchor, Buffer, BufferSnapshot, OffsetRangeExt as _, Point, ToOffset as _};use project::{LocationLink, Project, ProjectPath};use smallvec::SmallVec;diff --git a/crates/edit_prediction_ui/src/edit_prediction_button.rs b/crates/edit_prediction_ui/src/edit_prediction_button.rsindex d8e52fe8a7b..9f2b7a5f1fc 100644--- a/crates/edit_prediction_ui/src/edit_prediction_button.rs+++ b/crates/edit_prediction_ui/src/edit_prediction_button.rs@@ -12,7 +12,7 @@ use feature_flags::FeatureFlagAppExt;use fs::Fs;use gpui::{Action, Anchor, Animation, AnimationExt, App, AsyncWindowContext, Entity, FocusHandle,- Focusable, IntoElement, ParentElement, Render, Subscription, WeakEntity, actions, div,+ Focusable, IntoElement, ParentElement, Render, Subscription, TaskExt, WeakEntity, actions, div,ease_in_out, pulsating_between,};use indoc::indoc;diff --git a/crates/edit_prediction_ui/src/edit_prediction_ui.rs b/crates/edit_prediction_ui/src/edit_prediction_ui.rsindex 2f6280619ad..05f1224f506 100644--- a/crates/edit_prediction_ui/src/edit_prediction_ui.rs+++ b/crates/edit_prediction_ui/src/edit_prediction_ui.rs@@ -7,6 +7,7 @@ use edit_prediction::{EditPredictionStore, ResetOnboarding, capture_example};use edit_prediction_context_view::EditPredictionContextView;use editor::Editor;use feature_flags::FeatureFlagAppExt as _;+use gpui::TaskExt;use gpui::actions;use language::language_settings::AllLanguageSettings;use project::DisableAiSettings;diff --git a/crates/editor/src/clangd_ext.rs b/crates/editor/src/clangd_ext.rsindex c52089ca6ac..fbe58b06abb 100644--- a/crates/editor/src/clangd_ext.rs+++ b/crates/editor/src/clangd_ext.rs@@ -1,5 +1,5 @@use anyhow::Context as _;-use gpui::{App, Context, Entity, Window};+use gpui::{App, Context, Entity, TaskExt, Window};use language::Language;use project::lsp_store::lsp_ext_command::SwitchSourceHeaderResult;use rpc::proto;diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rsindex 2c609e5ba81..904ebb1f810 100644--- a/crates/editor/src/code_context_menus.rs+++ b/crates/editor/src/code_context_menus.rs@@ -2,8 +2,8 @@ use crate::scroll::ScrollAmount;use fuzzy::{StringMatch, StringMatchCandidate};use gpui::{AnyElement, Entity, Focusable, FontWeight, ListSizingBehavior, ScrollHandle, ScrollStrategy,- SharedString, Size, StrikethroughStyle, StyledText, Task, UniformListScrollHandle, div, px,- uniform_list,+ SharedString, Size, StrikethroughStyle, StyledText, Task, TaskExt, UniformListScrollHandle,+ div, px, uniform_list,};use itertools::Itertools;use language::CodeLabel;diff --git a/crates/editor/src/code_lens.rs b/crates/editor/src/code_lens.rsindex c123eceea3d..c78620e25fd 100644--- a/crates/editor/src/code_lens.rs+++ b/crates/editor/src/code_lens.rs@@ -2,7 +2,7 @@ use std::sync::Arc;use collections::{HashMap, HashSet};use futures::future::join_all;-use gpui::{MouseButton, SharedString, Task, WeakEntity};+use gpui::{MouseButton, SharedString, Task, TaskExt, WeakEntity};use itertools::Itertools;use language::{BufferId, ClientCommand};use multi_buffer::{Anchor, MultiBufferRow, MultiBufferSnapshot, ToPoint as _};diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rsindex 304f44d3c38..9649b638a3b 100644--- a/crates/editor/src/editor_tests.rs+++ b/crates/editor/src/editor_tests.rs@@ -18,8 +18,8 @@ use buffer_diff::{BufferDiff, DiffHunkSecondaryStatus, DiffHunkStatus, DiffHunkSuse collections::HashMap;use futures::{StreamExt, channel::oneshot};use gpui::{- BackgroundExecutor, DismissEvent, Task, TestAppContext, UpdateGlobal, VisualTestContext,- WindowBounds, WindowOptions, div,+ BackgroundExecutor, DismissEvent, Task, TaskExt, TestAppContext, UpdateGlobal,+ VisualTestContext, WindowBounds, WindowOptions, div,};use indoc::indoc;use language::{diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rsindex 7e751535910..22eaeca92e4 100644--- a/crates/editor/src/element.rs+++ b/crates/editor/src/element.rs@@ -46,9 +46,9 @@ use gpui::{Modifiers, ModifiersChangedEvent, MouseButton, MouseClickEvent, MouseDownEvent, MouseMoveEvent,MousePressureEvent, MouseUpEvent, PaintQuad, ParentElement, Pixels, PressureStage, ScrollDelta,ScrollHandle, ScrollWheelEvent, ShapedLine, SharedString, Size, StatefulInteractiveElement,- Style, Styled, StyledText, TextAlign, TextRun, TextStyleRefinement, WeakEntity, Window,- anchored, deferred, div, fill, linear_color_stop, linear_gradient, outline, pattern_slash,- point, px, quad, relative, size, solid_background, transparent_black,+ Style, Styled, StyledText, TaskExt, TextAlign, TextRun, TextStyleRefinement, WeakEntity,+ Window, anchored, deferred, div, fill, linear_color_stop, linear_gradient, outline,+ pattern_slash, point, px, quad, relative, size, solid_background, transparent_black,};use itertools::Itertools;use language::{diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rsindex cfa7284127e..6474170aace 100644--- a/crates/editor/src/hover_popover.rs+++ b/crates/editor/src/hover_popover.rs@@ -11,8 +11,8 @@ use anyhow::Context as _;use gpui::{AnyElement, App, AsyncWindowContext, Bounds, Context, Entity, Focusable as _, FontWeight, Hsla,InteractiveElement, IntoElement, MouseButton, ParentElement, Pixels, ScrollHandle, Size,- StatefulInteractiveElement, StyleRefinement, Styled, Subscription, Task, TextStyleRefinement,- Window, canvas, div, px,+ StatefulInteractiveElement, StyleRefinement, Styled, Subscription, Task, TaskExt,+ TextStyleRefinement, Window, canvas, div, px,};use itertools::Itertools;use language::{DiagnosticEntry, Language, LanguageRegistry};diff --git a/crates/editor/src/rust_analyzer_ext.rs b/crates/editor/src/rust_analyzer_ext.rsindex 6d4d5999617..ab59586c3a8 100644--- a/crates/editor/src/rust_analyzer_ext.rs+++ b/crates/editor/src/rust_analyzer_ext.rs@@ -1,7 +1,7 @@use std::{fs, path::Path};use anyhow::Context as _;-use gpui::{App, AppContext as _, Context, Entity, Window};+use gpui::{App, AppContext as _, Context, Entity, TaskExt, Window};use language::{Capability, Language, proto::serialize_anchor};use multi_buffer::MultiBuffer;use project::{diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rsindex ca43b4a3993..4ebee680621 100644--- a/crates/extension_host/src/extension_host.rs+++ b/crates/extension_host/src/extension_host.rs@@ -31,8 +31,8 @@ use futures::{select_biased,};use gpui::{- App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Global, Task, UpdateGlobal as _,- WeakEntity, actions,+ App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Global, Task, TaskExt,+ UpdateGlobal as _, WeakEntity, actions,};use http_client::{AsyncBody, HttpClient, HttpClientWithUrl};use language::{diff --git a/crates/extension_host/src/extension_store_test.rs b/crates/extension_host/src/extension_store_test.rsindex abdb3ffd3fa..2e2408ea2d9 100644--- a/crates/extension_host/src/extension_store_test.rs+++ b/crates/extension_host/src/extension_store_test.rs@@ -8,7 +8,7 @@ use collections::{BTreeMap, HashSet};use extension::ExtensionHostProxy;use fs::{FakeFs, Fs, RealFs};use futures::{AsyncReadExt, FutureExt, StreamExt, io::BufReader};-use gpui::{AppContext as _, BackgroundExecutor, TestAppContext};+use gpui::{AppContext as _, BackgroundExecutor, TaskExt, TestAppContext};use http_client::{FakeHttpClient, Response};use language::{BinaryStatus, LanguageMatcher, LanguageName, LanguageRegistry};use language_extension::LspAccess;diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rsindex 0e6bfe8498d..af3b9031e44 100644--- a/crates/extensions_ui/src/extensions_ui.rs+++ b/crates/extensions_ui/src/extensions_ui.rs@@ -15,7 +15,7 @@ use extension_host::{ExtensionManifest, ExtensionOperation, ExtensionStore};use fuzzy::{StringMatchCandidate, match_strings};use gpui::{Action, Anchor, App, ClipboardItem, Context, Entity, EventEmitter, Focusable,- InteractiveElement, KeyContext, ParentElement, Point, Render, Styled, Task, TextStyle,+ InteractiveElement, KeyContext, ParentElement, Point, Render, Styled, Task, TaskExt, TextStyle,UniformListScrollHandle, WeakEntity, Window, actions, point, uniform_list,};use num_format::{Locale, ToFormattedString};diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rsindex 66acefde69f..c15524b17bf 100644--- a/crates/file_finder/src/file_finder.rs+++ b/crates/file_finder/src/file_finder.rs@@ -14,7 +14,7 @@ use fuzzy_nucleo::{PathMatch, PathMatchCandidate};use gpui::{Action, AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,KeyContext, Modifiers, ModifiersChangedEvent, ParentElement, Render,- StatefulInteractiveElement, Styled, Task, WeakEntity, Window, actions, rems,+ StatefulInteractiveElement, Styled, Task, TaskExt, WeakEntity, Window, actions, rems,};use open_path_prompt::{OpenPathPrompt,diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rsindex 69829231619..64f1032ce59 100644--- a/crates/git_ui/src/branch_picker.rs+++ b/crates/git_ui/src/branch_picker.rs@@ -8,7 +8,7 @@ use gpui::http_client::Url;use gpui::{Action, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,InteractiveElement, IntoElement, Modifiers, ModifiersChangedEvent, ParentElement, Render,- SharedString, Styled, Subscription, Task, WeakEntity, Window, actions, rems,+ SharedString, Styled, Subscription, Task, TaskExt, WeakEntity, Window, actions, rems,};use picker::{Picker, PickerDelegate, PickerEditorPosition};use project::git_store::{Repository, RepositoryEvent};diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rsindex 820c880a1bd..a9e558b1566 100644--- a/crates/git_ui/src/git_panel.rs+++ b/crates/git_ui/src/git_panel.rs@@ -39,8 +39,8 @@ use git::{use gpui::{AbsoluteLength, Action, Anchor, AsyncApp, AsyncWindowContext, Bounds, ClickEvent, DismissEvent,Empty, Entity, EventEmitter, FocusHandle, Focusable, KeyContext, MouseButton, MouseDownEvent,- Point, PromptLevel, ScrollStrategy, Subscription, Task, TextStyle, UniformListScrollHandle,- WeakEntity, actions, anchored, deferred, point, size, uniform_list,+ Point, PromptLevel, ScrollStrategy, Subscription, Task, TaskExt, TextStyle,+ UniformListScrollHandle, WeakEntity, actions, anchored, deferred, point, size, uniform_list,};use itertools::Itertools;use language::{Buffer, File};diff --git a/crates/git_ui/src/git_ui.rs b/crates/git_ui/src/git_ui.rsindex f4c2a441d45..4fda322cc89 100644--- a/crates/git_ui/src/git_ui.rs+++ b/crates/git_ui/src/git_ui.rs@@ -17,7 +17,7 @@ use git::{};use gpui::{App, ClipboardItem, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,- SharedString, Subscription, Task, Window,+ SharedString, Subscription, Task, TaskExt, Window,};use menu::{Cancel, Confirm};use project::git_store::Repository;diff --git a/crates/git_ui/src/stash_picker.rs b/crates/git_ui/src/stash_picker.rsindex 6e6833f3cb4..190fca9fa51 100644--- a/crates/git_ui/src/stash_picker.rs+++ b/crates/git_ui/src/stash_picker.rs@@ -4,7 +4,7 @@ use git::stash::StashEntry;use gpui::{Action, AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,InteractiveElement, IntoElement, Modifiers, ModifiersChangedEvent, ParentElement, Render,- SharedString, Styled, Subscription, Task, WeakEntity, Window, actions, rems,+ SharedString, Styled, Subscription, Task, TaskExt, WeakEntity, Window, actions, rems,};use picker::{Picker, PickerDelegate};use project::git_store::{Repository, RepositoryEvent};diff --git a/crates/git_ui/src/worktree_picker.rs b/crates/git_ui/src/worktree_picker.rsindex 49a42438f45..8b22dfdd614 100644--- a/crates/git_ui/src/worktree_picker.rs+++ b/crates/git_ui/src/worktree_picker.rs@@ -7,8 +7,8 @@ use fuzzy::StringMatchCandidate;use git::repository::Worktree as GitWorktree;use gpui::{Action, AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,- IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Task, WeakEntity,- Window, actions, rems,+ IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Task, TaskExt,+ WeakEntity, Window, actions, rems,};use picker::{Picker, PickerDelegate, PickerEditorPosition};use project::Project;diff --git a/crates/git_ui/src/worktree_service.rs b/crates/git_ui/src/worktree_service.rsindex ba411cb0642..0ec34f3d915 100644--- a/crates/git_ui/src/worktree_service.rs+++ b/crates/git_ui/src/worktree_service.rs@@ -4,7 +4,7 @@ use std::sync::Arc;use anyhow::anyhow;use collections::HashSet;use fs::Fs;-use gpui::{AsyncWindowContext, Entity, SharedString, WeakEntity};+use gpui::{AsyncWindowContext, Entity, SharedString, TaskExt, WeakEntity};use project::Project;use project::git_store::Repository;use project::project_settings::ProjectSettings;diff --git a/crates/gpui/src/executor.rs b/crates/gpui/src/executor.rsindex ab253472ad8..07f1667b620 100644--- a/crates/gpui/src/executor.rs+++ b/crates/gpui/src/executor.rs@@ -4,12 +4,11 @@ use futures::prelude::*;use gpui_util::{TryFutureExt, TryFutureExtBacktrace};use scheduler::Instant;use scheduler::Scheduler;-use std::{- fmt::Debug, future::Future, marker::PhantomData, mem, pin::Pin, rc::Rc, sync::Arc,- time::Duration,-};+use std::{future::Future, marker::PhantomData, mem, pin::Pin, rc::Rc, sync::Arc, time::Duration};-pub use scheduler::{FallibleTask, ForegroundExecutor as SchedulerForegroundExecutor, Priority};+pub use scheduler::{+ FallibleTask, ForegroundExecutor as SchedulerForegroundExecutor, Priority, Task,+};/// A pointer to the executor that is currently running,/// for spawning background tasks.@@ -28,83 +27,32 @@ pub struct ForegroundExecutor {not_send: PhantomData<Rc<()>>,}-/// Task is a primitive that allows work to happen in the background.+/// Extension trait for `Task<Result<T, E>>` that adds `detach_and_log_err` with an `&App` context.///-/// It implements [`Future`] so you can `.await` on it.-///-/// If you drop a task it will be cancelled immediately. Calling [`Task::detach`] allows-/// the task to continue running, but with no way to return a value.-#[must_use]-#[derive(Debug)]-pub struct Task<T>(scheduler::Task<T>);--impl<T> Task<T> {- /// Creates a new task that will resolve with the value.- pub fn ready(val: T) -> Self {- Task(scheduler::Task::ready(val))- }-- /// Returns true if the task has completed or was created with `Task::ready`.- pub fn is_ready(&self) -> bool {- self.0.is_ready()- }-- /// Detaching a task runs it to completion in the background.- pub fn detach(self) {- self.0.detach()- }-- /// Wraps a scheduler::Task.- pub fn from_scheduler(task: scheduler::Task<T>) -> Self {- Task(task)- }-- /// Converts this task into a fallible task that returns `Option<T>`.- ///- /// Unlike the standard `Task<T>`, a [`FallibleTask`] will return `None`- /// if the task was cancelled.- ///- /// # Example- ///- /// ```ignore- /// // Background task that gracefully handles cancellation:- /// cx.background_spawn(async move {- /// let result = foreground_task.fallible().await;- /// if let Some(value) = result {- /// // Process the value- /// }- /// // If None, task was cancelled - just exit gracefully- /// }).detach();- /// ```- pub fn fallible(self) -> FallibleTask<T> {- self.0.fallible()- }+/// This trait is automatically implemented for all `Task<Result<T, E>>` types.+pub trait TaskExt<T, E> {+ /// Run the task to completion in the background and log any errors that occur.+ fn detach_and_log_err(self, cx: &App);+ /// Like [`Self::detach_and_log_err`], but uses `{:?}` formatting on failure so `anyhow::Error`+ /// values emit their full backtrace. Prefer `detach_and_log_err` unless a backtrace is wanted.+ fn detach_and_log_err_with_backtrace(self, cx: &App);}-impl<T, E> Task<Result<T, E>>+impl<T, E> TaskExt<T, E> for Task<Result<T, E>>whereT: 'static,- E: 'static + std::fmt::Display,+ E: 'static + std::fmt::Display + std::fmt::Debug,{- /// Run the task to completion in the background and log any errors that occur.#[track_caller]- pub fn detach_and_log_err(self, cx: &App) {+ fn detach_and_log_err(self, cx: &App) {let location = core::panic::Location::caller();cx.foreground_executor().spawn(self.log_tracked_err(*location)).detach();}-}-impl<T, E> Task<Result<T, E>>-where- T: 'static,- E: 'static + std::fmt::Debug,-{- /// Like [`Self::detach_and_log_err`], but uses `{:?}` formatting on failure so `anyhow::Error`- /// values emit their full backtrace. Prefer `detach_and_log_err` unless a backtrace is wanted.#[track_caller]- pub fn detach_and_log_err_with_backtrace(self, cx: &App) {+ fn detach_and_log_err_with_backtrace(self, cx: &App) {let location = *core::panic::Location::caller();cx.foreground_executor().spawn(self.log_tracked_err_with_backtrace(location))@@ -112,20 +60,6 @@ where}}-impl<T> std::future::Future for Task<T> {- type Output = T;-- fn poll(- self: std::pin::Pin<&mut Self>,- cx: &mut std::task::Context<'_>,- ) -> std::task::Poll<Self::Output> {- // SAFETY: Task is a repr(transparent) wrapper around scheduler::Task,- // and we're just projecting the pin through to the inner task.- let inner = unsafe { self.map_unchecked_mut(|t| &mut t.0) };- inner.poll(cx)- }-}-impl BackgroundExecutor {/// Creates a new BackgroundExecutor from the given PlatformDispatcher.pub fn new(dispatcher: Arc<dyn PlatformDispatcher>) -> Self {@@ -175,9 +109,9 @@ impl BackgroundExecutor {R: Send + 'static,{if priority == Priority::RealtimeAudio {- Task::from_scheduler(self.inner.spawn_realtime(future))+ self.inner.spawn_realtime(future)} else {- Task::from_scheduler(self.inner.spawn_with_priority(priority, future))+ self.inner.spawn_with_priority(priority, future)}}@@ -426,7 +360,7 @@ impl ForegroundExecutor {whereR: 'static,{- Task::from_scheduler(self.inner.spawn(future.boxed_local()))+ self.inner.spawn(future.boxed_local())}/// Enqueues the given Task to run on the main thread with the given priority.@@ -440,7 +374,7 @@ impl ForegroundExecutor {R: 'static,{// Priority is ignored for foreground tasks - they run in order on the main thread- Task::from_scheduler(self.inner.spawn(future))+ self.inner.spawn(future)}/// Used by the test harness to run an async test in a synchronous fashion.diff --git a/crates/gpui/src/prelude.rs b/crates/gpui/src/prelude.rsindex 191d0a0e6d4..b5185a25e86 100644--- a/crates/gpui/src/prelude.rs+++ b/crates/gpui/src/prelude.rs@@ -5,5 +5,5 @@pub use crate::{AppContext as _, BorrowAppContext, Context, Element, InteractiveElement, IntoElement,ParentElement, Refineable, Render, RenderOnce, StatefulInteractiveElement, Styled, StyledImage,- VisualContext, util::FluentBuilder,+ TaskExt as _, VisualContext, util::FluentBuilder,};diff --git a/crates/inspector_ui/src/inspector.rs b/crates/inspector_ui/src/inspector.rsindex b687ea70a57..36eed3bc72c 100644--- a/crates/inspector_ui/src/inspector.rs+++ b/crates/inspector_ui/src/inspector.rs@@ -1,5 +1,5 @@use anyhow::{Context as _, anyhow};-use gpui::{App, DivInspectorState, Inspector, InspectorElementId, IntoElement, Window};+use gpui::{App, DivInspectorState, Inspector, InspectorElementId, IntoElement, TaskExt, Window};use std::{cell::OnceCell, path::Path, sync::Arc};use ui::{Label, Tooltip, prelude::*, utils::platform_title_bar_height};use util::{ResultExt as _, command::new_command};diff --git a/crates/journal/src/journal.rs b/crates/journal/src/journal.rsindex b8028c79b3d..713317b70db 100644--- a/crates/journal/src/journal.rs+++ b/crates/journal/src/journal.rs@@ -1,7 +1,7 @@use chrono::{Datelike, Local, NaiveTime, Timelike};use editor::scroll::Autoscroll;use editor::{Editor, SelectionEffects};-use gpui::{App, AppContext as _, Context, Window, actions};+use gpui::{App, AppContext as _, Context, TaskExt, Window, actions};pub use settings::HourFormat;use settings::{RegisterSetting, Settings};use std::{diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rsindex af5e53300a7..7f19b81d6dc 100644--- a/crates/language_models/src/provider/anthropic.rs+++ b/crates/language_models/src/provider/anthropic.rs@@ -5,7 +5,7 @@ use anyhow::Result;use collections::BTreeMap;use credentials_provider::CredentialsProvider;use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};-use gpui::{AnyView, App, AsyncApp, Context, Entity, Task};+use gpui::{AnyView, App, AsyncApp, Context, Entity, Task, TaskExt};use http_client::HttpClient;use language_model::{ANTHROPIC_PROVIDER_ID, ANTHROPIC_PROVIDER_NAME, ApiKeyState, AuthenticateError,diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rsindex fb48e7d73a2..97eb5456e5d 100644--- a/crates/language_models/src/provider/bedrock.rs+++ b/crates/language_models/src/provider/bedrock.rs@@ -25,7 +25,8 @@ use collections::{BTreeMap, HashMap};use credentials_provider::CredentialsProvider;use futures::{FutureExt, Stream, StreamExt, future::BoxFuture, stream::BoxStream};use gpui::{- AnyView, App, AsyncApp, Context, Entity, FocusHandle, Subscription, Task, Window, actions,+ AnyView, App, AsyncApp, Context, Entity, FocusHandle, Subscription, Task, TaskExt, Window,+ actions,};use gpui_tokio::Tokio;use http_client::HttpClient;diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rsindex 0dae88fc307..c37b0162d45 100644--- a/crates/language_models/src/provider/cloud.rs+++ b/crates/language_models/src/provider/cloud.rs@@ -7,7 +7,7 @@ use cloud_api_types::Plan;use futures::FutureExt;use futures::StreamExt;use futures::future::BoxFuture;-use gpui::{AnyElement, AnyView, App, AppContext, Context, Entity, Subscription, Task};+use gpui::{AnyElement, AnyView, App, AppContext, Context, Entity, Subscription, Task, TaskExt};use language_model::{AuthenticateError, IconOrSvg, LanguageModel, LanguageModelProvider, LanguageModelProviderId,LanguageModelProviderName, LanguageModelProviderState, ZED_CLOUD_PROVIDER_ID,diff --git a/crates/language_models/src/provider/deepseek.rs b/crates/language_models/src/provider/deepseek.rsindex 9f10da20c12..757539a0895 100644--- a/crates/language_models/src/provider/deepseek.rs+++ b/crates/language_models/src/provider/deepseek.rs@@ -5,7 +5,7 @@ use deepseek::DEEPSEEK_API_URL;use futures::Stream;use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};+use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};use http_client::HttpClient;use language_model::{ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rsindex 87f2eeb26ab..d5b47bf4583 100644--- a/crates/language_models/src/provider/google.rs+++ b/crates/language_models/src/provider/google.rs@@ -4,7 +4,7 @@ use credentials_provider::CredentialsProvider;use futures::{FutureExt, StreamExt, future::BoxFuture};pub use google_ai::completion::{GoogleEventMapper, into_google};use google_ai::{GenerateContentResponse, GoogleModelMode};-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};+use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};use http_client::HttpClient;use language_model::{AuthenticateError, ConfigurationViewTargetAgent, EnvVar, LanguageModelCompletionError,diff --git a/crates/language_models/src/provider/lmstudio.rs b/crates/language_models/src/provider/lmstudio.rsindex 50ac1286524..ea19c265e9c 100644--- a/crates/language_models/src/provider/lmstudio.rs+++ b/crates/language_models/src/provider/lmstudio.rs@@ -4,7 +4,7 @@ use credentials_provider::CredentialsProvider;use fs::Fs;use futures::Stream;use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};-use gpui::{AnyView, App, AsyncApp, Context, CursorStyle, Entity, Subscription, Task};+use gpui::{AnyView, App, AsyncApp, Context, CursorStyle, Entity, Subscription, Task, TaskExt};use http_client::HttpClient;use language_model::{ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,diff --git a/crates/language_models/src/provider/mistral.rs b/crates/language_models/src/provider/mistral.rsindex 403d94e9832..65eea3b696b 100644--- a/crates/language_models/src/provider/mistral.rs+++ b/crates/language_models/src/provider/mistral.rs@@ -3,7 +3,7 @@ use collections::BTreeMap;use credentials_provider::CredentialsProvider;use futures::{FutureExt, Stream, StreamExt, future::BoxFuture, stream::BoxStream};-use gpui::{AnyView, App, AsyncApp, Context, Entity, Global, SharedString, Task, Window};+use gpui::{AnyView, App, AsyncApp, Context, Entity, Global, SharedString, Task, TaskExt, Window};use http_client::HttpClient;use language_model::{ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,diff --git a/crates/language_models/src/provider/ollama.rs b/crates/language_models/src/provider/ollama.rsindex f38321b7c88..d117bce3784 100644--- a/crates/language_models/src/provider/ollama.rs+++ b/crates/language_models/src/provider/ollama.rs@@ -3,7 +3,7 @@ use credentials_provider::CredentialsProvider;use fs::Fs;use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};use futures::{Stream, TryFutureExt, stream};-use gpui::{AnyView, App, AsyncApp, Context, CursorStyle, Entity, Task};+use gpui::{AnyView, App, AsyncApp, Context, CursorStyle, Entity, Task, TaskExt};use http_client::HttpClient;use language_model::{ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rsindex 5557ce2d047..4957eea9635 100644--- a/crates/language_models/src/provider/open_ai.rs+++ b/crates/language_models/src/provider/open_ai.rs@@ -2,7 +2,7 @@ use anyhow::Result;use collections::BTreeMap;use credentials_provider::CredentialsProvider;use futures::{FutureExt, StreamExt, future::BoxFuture};-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};+use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};use http_client::HttpClient;use language_model::{ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rsindex 5f7f6db3d36..a80965eced5 100644--- a/crates/language_models/src/provider/open_ai_compatible.rs+++ b/crates/language_models/src/provider/open_ai_compatible.rs@@ -2,7 +2,7 @@ use anyhow::Result;use convert_case::{Case, Casing};use credentials_provider::CredentialsProvider;use futures::{FutureExt, StreamExt, future::BoxFuture};-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};+use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};use http_client::HttpClient;use language_model::{ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,diff --git a/crates/language_models/src/provider/open_router.rs b/crates/language_models/src/provider/open_router.rsindex bc4fbcc9aa7..c0b0e330629 100644--- a/crates/language_models/src/provider/open_router.rs+++ b/crates/language_models/src/provider/open_router.rs@@ -2,7 +2,7 @@ use anyhow::Result;use collections::HashMap;use credentials_provider::CredentialsProvider;use futures::{FutureExt, Stream, StreamExt, future::BoxFuture};-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task};+use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt};use http_client::HttpClient;use language_model::{ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,diff --git a/crates/language_models/src/provider/opencode.rs b/crates/language_models/src/provider/opencode.rsindex 4380d2e1a13..647e8496b05 100644--- a/crates/language_models/src/provider/opencode.rs+++ b/crates/language_models/src/provider/opencode.rs@@ -3,7 +3,7 @@ use collections::BTreeMap;use credentials_provider::CredentialsProvider;use fs::Fs;use futures::{FutureExt, StreamExt, future::BoxFuture};-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};+use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};use http_client::{AsyncBody, HttpClient, http};use language_model::{ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,diff --git a/crates/language_models/src/provider/vercel_ai_gateway.rs b/crates/language_models/src/provider/vercel_ai_gateway.rsindex 789e8e35e85..312cdee5a66 100644--- a/crates/language_models/src/provider/vercel_ai_gateway.rs+++ b/crates/language_models/src/provider/vercel_ai_gateway.rs@@ -2,7 +2,7 @@ use anyhow::Result;use collections::BTreeMap;use credentials_provider::CredentialsProvider;use futures::{AsyncReadExt, FutureExt, StreamExt, future::BoxFuture};-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};+use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest, http};use language_model::{ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,diff --git a/crates/language_models/src/provider/x_ai.rs b/crates/language_models/src/provider/x_ai.rsindex 12f195417b5..623853b5214 100644--- a/crates/language_models/src/provider/x_ai.rs+++ b/crates/language_models/src/provider/x_ai.rs@@ -2,7 +2,7 @@ use anyhow::Result;use collections::BTreeMap;use credentials_provider::CredentialsProvider;use futures::{FutureExt, StreamExt, future::BoxFuture};-use gpui::{AnyView, App, AsyncApp, Context, Entity, Task, Window};+use gpui::{AnyView, App, AsyncApp, Context, Entity, Task, TaskExt, Window};use http_client::HttpClient;use language_model::{ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,diff --git a/crates/language_selector/src/language_selector.rs b/crates/language_selector/src/language_selector.rsindex 70a03514f45..cd457cb50f9 100644--- a/crates/language_selector/src/language_selector.rs+++ b/crates/language_selector/src/language_selector.rs@@ -6,7 +6,7 @@ use editor::Editor;use fuzzy::{StringMatch, StringMatchCandidate, match_strings};use gpui::{App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, ParentElement,- Render, Styled, WeakEntity, Window, actions,+ Render, Styled, TaskExt, WeakEntity, Window, actions,};use language::{Buffer, LanguageMatcher, LanguageName, LanguageRegistry};use open_path_prompt::file_finder_settings::FileFinderSettings;diff --git a/crates/language_tools/src/lsp_button.rs b/crates/language_tools/src/lsp_button.rsindex 8fbe4385a17..63529ea0cf3 100644--- a/crates/language_tools/src/lsp_button.rs+++ b/crates/language_tools/src/lsp_button.rs@@ -13,7 +13,7 @@ use language::language_settings::{EditPredictionProvider, all_language_settings}use client::proto;use collections::HashSet;use editor::{Editor, EditorEvent};-use gpui::{Anchor, Entity, Subscription, Task, WeakEntity, actions};+use gpui::{Anchor, Entity, Subscription, Task, TaskExt, WeakEntity, actions};use language::{BinaryStatus, BufferId, ServerHealth};use lsp::{LanguageServerId, LanguageServerName, LanguageServerSelector};use project::{diff --git a/crates/onboarding/src/basics_page.rs b/crates/onboarding/src/basics_page.rsindex 7d021c54447..30e69a320ea 100644--- a/crates/onboarding/src/basics_page.rs+++ b/crates/onboarding/src/basics_page.rs@@ -5,7 +5,7 @@ use client::{Client, TelemetrySettings, UserStore, zed_urls};use cloud_api_types::Plan;use collections::HashMap;use fs::Fs;-use gpui::{Action, Animation, AnimationExt, App, Entity, IntoElement, pulsating_between};+use gpui::{Action, Animation, AnimationExt, App, Entity, IntoElement, TaskExt, pulsating_between};use project::agent_server_store::AllAgentServersSettings;use project::project_settings::ProjectSettings;use project::{AgentRegistryStore, RegistryAgent};diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rsindex 7b378c6fb82..9e179c97a7d 100644--- a/crates/outline_panel/src/outline_panel.rs+++ b/crates/outline_panel/src/outline_panel.rs@@ -18,7 +18,7 @@ use gpui::{DismissEvent, Div, ElementId, Entity, EventEmitter, FocusHandle, Focusable, HighlightStyle,InteractiveElement, IntoElement, KeyContext, ListHorizontalSizingBehavior, ListSizingBehavior,MouseButton, MouseDownEvent, ParentElement, Pixels, Point, Render, ScrollStrategy,- SharedString, Stateful, StatefulInteractiveElement as _, Styled, Subscription, Task,+ SharedString, Stateful, StatefulInteractiveElement as _, Styled, Subscription, Task, TaskExt,UniformListScrollHandle, WeakEntity, Window, actions, anchored, deferred, div, point, px, size,uniform_list,};diff --git a/crates/project/src/agent_registry_store.rs b/crates/project/src/agent_registry_store.rsindex b2010da65d9..21c07b0feba 100644--- a/crates/project/src/agent_registry_store.rs+++ b/crates/project/src/agent_registry_store.rs@@ -6,7 +6,7 @@ use anyhow::{Context as _, Result, bail};use collections::HashMap;use fs::Fs;use futures::AsyncReadExt;-use gpui::{App, AppContext as _, Context, Entity, Global, SharedString, Task};+use gpui::{App, AppContext as _, Context, Entity, Global, SharedString, Task, TaskExt};use http_client::{AsyncBody, HttpClient};use serde::Deserialize;use settings::Settings as _;diff --git a/crates/project/src/agent_server_store.rs b/crates/project/src/agent_server_store.rsindex cdde687ec63..3d231a3e8ef 100644--- a/crates/project/src/agent_server_store.rs+++ b/crates/project/src/agent_server_store.rs@@ -8,7 +8,7 @@ use std::{use anyhow::{Context as _, Result, bail};use collections::HashMap;use fs::Fs;-use gpui::{AsyncApp, Context, Entity, EventEmitter, SharedString, Subscription, Task};+use gpui::{AsyncApp, Context, Entity, EventEmitter, SharedString, Subscription, Task, TaskExt};use http_client::{HttpClient, github::AssetKind};use node_runtime::NodeRuntime;use percent_encoding::percent_decode_str;diff --git a/crates/project/src/buffer_store.rs b/crates/project/src/buffer_store.rsindex 2e234a7f936..f9076753998 100644--- a/crates/project/src/buffer_store.rs+++ b/crates/project/src/buffer_store.rs@@ -8,7 +8,8 @@ use client::Client;use collections::{HashMap, HashSet, hash_map};use futures::{Future, FutureExt as _, channel::oneshot, future::Shared};use gpui::{- App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Subscription, Task, WeakEntity,+ App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Subscription, Task, TaskExt,+ WeakEntity,};use language::{Buffer, BufferEvent, Capability, DiskState, File as _, Language, LineEnding, Operation,diff --git a/crates/project/src/context_server_store.rs b/crates/project/src/context_server_store.rsindex 7b9fc16f100..1ea6d2c4188 100644--- a/crates/project/src/context_server_store.rs+++ b/crates/project/src/context_server_store.rs@@ -13,7 +13,9 @@ use context_server::{ContextServer, ContextServerCommand, ContextServerId};use credentials_provider::CredentialsProvider;use futures::future::Either;use futures::{FutureExt as _, StreamExt as _, future::join_all};-use gpui::{App, AsyncApp, Context, Entity, EventEmitter, Subscription, Task, WeakEntity, actions};+use gpui::{+ App, AsyncApp, Context, Entity, EventEmitter, Subscription, Task, TaskExt, WeakEntity, actions,+};use http_client::HttpClient;use itertools::Itertools;use rand::Rng as _;diff --git a/crates/project/src/debugger/dap_store.rs b/crates/project/src/debugger/dap_store.rsindex 7ac9c02fe4f..e0594467f09 100644--- a/crates/project/src/debugger/dap_store.rs+++ b/crates/project/src/debugger/dap_store.rs@@ -30,7 +30,7 @@ use futures::{channel::mpsc::{self, UnboundedSender},future::{Shared, join_all},};-use gpui::{App, AppContext, AsyncApp, Context, Entity, EventEmitter, SharedString, Task};+use gpui::{App, AppContext, AsyncApp, Context, Entity, EventEmitter, SharedString, Task, TaskExt};use http_client::HttpClient;use language::{Buffer, LanguageToolchainStore};use node_runtime::NodeRuntime;diff --git a/crates/project/src/debugger/session.rs b/crates/project/src/debugger/session.rsindex feba6ff5520..39578eaf8f0 100644--- a/crates/project/src/debugger/session.rs+++ b/crates/project/src/debugger/session.rs@@ -38,7 +38,7 @@ use futures::{AsyncBufReadExt as _, SinkExt, StreamExt, TryStreamExt};use futures::{FutureExt, future::Shared};use gpui::{App, AppContext, AsyncApp, BackgroundExecutor, Context, Entity, EventEmitter, SharedString,- Task, WeakEntity,+ Task, TaskExt, WeakEntity,};use http_client::HttpClient;use node_runtime::NodeRuntime;diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rsindex d5c6565b6cc..8f49e4c9183 100644--- a/crates/project/src/git_store.rs+++ b/crates/project/src/git_store.rs@@ -47,7 +47,7 @@ use git::{};use gpui::{App, AppContext, AsyncApp, BackgroundExecutor, Context, Entity, EventEmitter, SharedString,- Subscription, Task, WeakEntity,+ Subscription, Task, TaskExt, WeakEntity,};use language::{Buffer, BufferEvent, Language, LanguageRegistry,diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rsindex e22f478eb9b..e110176dd20 100644--- a/crates/project/src/lsp_command.rs+++ b/crates/project/src/lsp_command.rs@@ -14,7 +14,7 @@ use client::proto::{self, PeerId};use clock::Global;use collections::HashMap;use futures::future;-use gpui::{App, AsyncApp, Entity, SharedString, Task, prelude::FluentBuilder};+use gpui::{App, AsyncApp, Entity, SharedString, Task, TaskExt, prelude::FluentBuilder};use language::{Anchor, Bias, Buffer, BufferSnapshot, CachedLspAdapter, CharKind, CharScopeContext,OffsetRangeExt, PointUtf16, ToOffset, ToPointUtf16, Transaction, Unclipped,diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rsindex ad3344fa25a..85229cfdcde 100644--- a/crates/project/src/lsp_store.rs+++ b/crates/project/src/lsp_store.rs@@ -65,7 +65,7 @@ use futures::{use globset::{Glob, GlobBuilder, GlobMatcher, GlobSet, GlobSetBuilder};use gpui::{App, AppContext, AsyncApp, Context, Entity, EventEmitter, PromptLevel, SharedString,- Subscription, Task, WeakEntity,+ Subscription, Task, TaskExt, WeakEntity,};use http_client::HttpClient;use itertools::Itertools as _;diff --git a/crates/project/src/lsp_store/log_store.rs b/crates/project/src/lsp_store/log_store.rsindex ae6f9ec09d4..0cfe3c14cf2 100644--- a/crates/project/src/lsp_store/log_store.rs+++ b/crates/project/src/lsp_store/log_store.rs@@ -2,7 +2,9 @@ use std::{collections::VecDeque, sync::Arc};use collections::HashMap;use futures::{StreamExt, channel::mpsc};-use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Global, Subscription, WeakEntity};+use gpui::{+ App, AppContext as _, Context, Entity, EventEmitter, Global, Subscription, TaskExt, WeakEntity,+};use lsp::{IoKind, LanguageServer, LanguageServerId, LanguageServerName, LanguageServerSelector,MessageType, TraceValue,diff --git a/crates/project/src/project.rs b/crates/project/src/project.rsindex 4e74c4cf1fc..ac34cbdd061 100644--- a/crates/project/src/project.rs+++ b/crates/project/src/project.rs@@ -86,7 +86,7 @@ use image_store::{ImageItemEvent, ImageStoreEvent};use ::git::{blame::Blame, status::FileStatus};use gpui::{App, AppContext, AsyncApp, BorrowAppContext, Context, Entity, EventEmitter, Hsla, SharedString,- Task, WeakEntity, Window,+ Task, TaskExt, WeakEntity, Window,};use language::{Buffer, BufferEvent, Capability, CodeLabel, CursorShape, DiskState, Language, LanguageName,diff --git a/crates/project/src/worktree_store.rs b/crates/project/src/worktree_store.rsindex c6abb6e1743..f544973a548 100644--- a/crates/project/src/worktree_store.rs+++ b/crates/project/src/worktree_store.rs@@ -12,7 +12,7 @@ use collections::HashMap;use fs::{Fs, copy_recursive};use futures::{FutureExt, future::Shared};use gpui::{- App, AppContext as _, AsyncApp, Context, Entity, EntityId, EventEmitter, Global, Task,+ App, AppContext as _, AsyncApp, Context, Entity, EntityId, EventEmitter, Global, Task, TaskExt,WeakEntity,};use itertools::Either;diff --git a/crates/project_benchmarks/src/main.rs b/crates/project_benchmarks/src/main.rsindex 054b5eb95a5..01dc141904e 100644--- a/crates/project_benchmarks/src/main.rs+++ b/crates/project_benchmarks/src/main.rs@@ -6,6 +6,7 @@ use clap::Parser;use client::{Client, UserStore};use futures::channel::oneshot;use gpui::AppContext as _;+use gpui::TaskExt;use http_client::FakeHttpClient;use language::LanguageRegistry;use node_runtime::NodeRuntime;diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rsindex 8edcd9a80d1..2202ff35e18 100644--- a/crates/project_symbols/src/project_symbols.rs+++ b/crates/project_symbols/src/project_symbols.rs@@ -1,8 +1,8 @@use editor::{Bias, Editor, SelectionEffects, scroll::Autoscroll, styled_runs_for_code_label};use fuzzy::{StringMatch, StringMatchCandidate};use gpui::{- App, Context, DismissEvent, Entity, HighlightStyle, ParentElement, StyledText, Task, TextStyle,- WeakEntity, Window, relative, rems,+ App, Context, DismissEvent, Entity, HighlightStyle, ParentElement, StyledText, Task, TaskExt,+ TextStyle, WeakEntity, Window, relative, rems,};use ordered_float::OrderedFloat;use picker::{Picker, PickerDelegate};diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rsindex 4b99ed37a38..a5fb5f60450 100644--- a/crates/recent_projects/src/recent_projects.rs+++ b/crates/recent_projects/src/recent_projects.rs@@ -25,7 +25,7 @@ use disconnected_overlay::DisconnectedOverlay;use fuzzy_nucleo::{StringMatch, StringMatchCandidate, match_strings};use gpui::{Action, AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,- Subscription, Task, WeakEntity, Window, actions, px,+ Subscription, Task, TaskExt, WeakEntity, Window, actions, px,};use picker::{diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rsindex f475baddd99..3c1ad319461 100644--- a/crates/recent_projects/src/remote_servers.rs+++ b/crates/recent_projects/src/remote_servers.rs@@ -15,7 +15,7 @@ use extension_host::ExtensionStore;use futures::{FutureExt, StreamExt as _, channel::oneshot, future::Shared};use gpui::{Action, AnyElement, App, ClickEvent, ClipboardItem, Context, DismissEvent, Entity,- EventEmitter, FocusHandle, Focusable, PromptLevel, ScrollHandle, Subscription, Task,+ EventEmitter, FocusHandle, Focusable, PromptLevel, ScrollHandle, Subscription, Task, TaskExt,WeakEntity, Window, canvas,};use log::{debug, info};diff --git a/crates/recent_projects/src/sidebar_recent_projects.rs b/crates/recent_projects/src/sidebar_recent_projects.rsindex 495907d3934..0b4d3722a34 100644--- a/crates/recent_projects/src/sidebar_recent_projects.rs+++ b/crates/recent_projects/src/sidebar_recent_projects.rs@@ -3,7 +3,7 @@ use std::sync::Arc;use fuzzy_nucleo::{StringMatch, StringMatchCandidate, match_strings};use gpui::{Action, AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,- Subscription, Task, WeakEntity, Window,+ Subscription, Task, TaskExt, WeakEntity, Window,};use picker::{Picker, PickerDelegate,diff --git a/crates/remote/src/remote_client.rs b/crates/remote/src/remote_client.rsindex 138238c5fd4..85e07aee0b4 100644--- a/crates/remote/src/remote_client.rs+++ b/crates/remote/src/remote_client.rs@@ -26,7 +26,7 @@ use futures::{};use gpui::{App, AppContext as _, AsyncApp, BackgroundExecutor, BorrowAppContext, Context, Entity,- EventEmitter, FutureExt, Global, Task, WeakEntity,+ EventEmitter, FutureExt, Global, Task, TaskExt, WeakEntity,};use parking_lot::Mutex;diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rsindex 7b0fc0356a1..098993debad 100644--- a/crates/remote_server/src/headless_project.rs+++ b/crates/remote_server/src/headless_project.rs@@ -8,7 +8,7 @@ use lsp::LanguageServerId;use extension::ExtensionHostProxy;use extension_host::headless_host::HeadlessExtensionStore;use fs::Fs;-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, PromptLevel};+use gpui::{App, AppContext as _, AsyncApp, Context, Entity, PromptLevel, TaskExt};use http_client::HttpClient;use language::{Buffer, BufferEvent, LanguageRegistry, proto::serialize_operation};use node_runtime::NodeRuntime;diff --git a/crates/repl/src/notebook/notebook_ui.rs b/crates/repl/src/notebook/notebook_ui.rsindex 78b7f1a4e51..d1c44667f94 100644--- a/crates/repl/src/notebook/notebook_ui.rs+++ b/crates/repl/src/notebook/notebook_ui.rs@@ -11,7 +11,7 @@ use futures::FutureExt;use futures::future::Shared;use gpui::{AnyElement, App, Entity, EventEmitter, FocusHandle, Focusable, KeyContext, ListScrollEvent,- ListState, Point, Task, actions, list, prelude::*,+ ListState, Point, Task, TaskExt, actions, list, prelude::*,};use jupyter_protocol::JupyterKernelspec;use language::{Language, LanguageRegistry};diff --git a/crates/repl/src/repl_sessions_ui.rs b/crates/repl/src/repl_sessions_ui.rsindex 9781382fc85..5fd1e922a50 100644--- a/crates/repl/src/repl_sessions_ui.rs+++ b/crates/repl/src/repl_sessions_ui.rs@@ -1,6 +1,6 @@use editor::Editor;use gpui::{- AnyElement, App, Entity, EventEmitter, FocusHandle, Focusable, Subscription, actions,+ AnyElement, App, Entity, EventEmitter, FocusHandle, Focusable, Subscription, TaskExt, actions,prelude::*,};use project::ProjectItem as _;diff --git a/crates/repl/src/repl_store.rs b/crates/repl/src/repl_store.rsindex 4c5827b7c0c..b2bf90e99dc 100644--- a/crates/repl/src/repl_store.rs+++ b/crates/repl/src/repl_store.rs@@ -4,7 +4,9 @@ use std::sync::Arc;use anyhow::{Context as _, Result};use collections::{HashMap, HashSet};use command_palette_hooks::CommandPaletteFilter;-use gpui::{App, Context, Entity, EntityId, Global, SharedString, Subscription, Task, prelude::*};+use gpui::{+ App, Context, Entity, EntityId, Global, SharedString, Subscription, Task, TaskExt, prelude::*,+};use jupyter_websocket_client::RemoteServer;use language::{Language, LanguageName};use project::{Fs, Project, ProjectPath, WorktreeId};diff --git a/crates/rules_library/src/rules_library.rs b/crates/rules_library/src/rules_library.rsindex e5105081ca7..9f87d403e72 100644--- a/crates/rules_library/src/rules_library.rs+++ b/crates/rules_library/src/rules_library.rs@@ -4,7 +4,7 @@ use editor::SelectionEffects;use editor::{CurrentLineHighlight, Editor, EditorElement, EditorEvent, EditorStyle, actions::Tab};use gpui::{App, Bounds, DEFAULT_ADDITIONAL_WINDOW_SIZE, Entity, EventEmitter, Focusable, PromptLevel,- Subscription, Task, TextStyle, Tiling, TitlebarOptions, WindowBounds, WindowHandle,+ Subscription, Task, TaskExt, TextStyle, Tiling, TitlebarOptions, WindowBounds, WindowHandle,WindowOptions, actions, point, size, transparent_black,};use language::{Buffer, LanguageRegistry, language_settings::SoftWrap};diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rsindex 41dda49efa3..30805264522 100644--- a/crates/search/src/buffer_search.rs+++ b/crates/search/src/buffer_search.rs@@ -22,7 +22,7 @@ use futures::channel::oneshot;use gpui::{Action as _, App, ClickEvent, Context, Entity, EventEmitter, Focusable,InteractiveElement as _, IntoElement, KeyContext, ParentElement as _, Render, ScrollHandle,- Styled, Subscription, Task, WeakEntity, Window, div,+ Styled, Subscription, Task, TaskExt, WeakEntity, Window, div,};use language::{Language, LanguageRegistry};use project::{diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rsindex 00966436595..1ca53632dba 100644--- a/crates/search/src/project_search.rs+++ b/crates/search/src/project_search.rs@@ -22,7 +22,8 @@ use futures::{StreamExt, stream::FuturesOrdered};use gpui::{Action, AnyElement, App, Axis, Context, Entity, EntityId, EventEmitter, FocusHandle, Focusable,Global, Hsla, InteractiveElement, IntoElement, KeyContext, ParentElement, Point, Render,- SharedString, Styled, Subscription, Task, UpdateGlobal, WeakEntity, Window, actions, div,+ SharedString, Styled, Subscription, Task, TaskExt, UpdateGlobal, WeakEntity, Window, actions,+ div,};use itertools::Itertools;use language::{Buffer, Language};diff --git a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rsindex fd6ea35c1e3..d101effe5bf 100644--- a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs+++ b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs@@ -5,7 +5,7 @@ use edit_prediction::{open_ai_compatible::{open_ai_compatible_api_token, open_ai_compatible_api_url},};use edit_prediction_ui::{get_available_providers, set_completion_provider};-use gpui::{App, Entity, ScrollHandle, prelude::*};+use gpui::{App, Entity, ScrollHandle, TaskExt, prelude::*};use language::language_settings::AllLanguageSettings;use settings::Settings as _;diff --git a/crates/sidebar/src/sidebar.rs b/crates/sidebar/src/sidebar.rsindex 57b7c9b2cbb..0000aac3f36 100644--- a/crates/sidebar/src/sidebar.rs+++ b/crates/sidebar/src/sidebar.rs@@ -23,8 +23,8 @@ use feature_flags::{};use gpui::{Action as _, AnyElement, App, ClickEvent, Context, DismissEvent, Entity, EntityId, FocusHandle,- Focusable, KeyContext, ListState, Modifiers, Pixels, Render, SharedString, Task, WeakEntity,- Window, WindowHandle, linear_color_stop, linear_gradient, list, prelude::*, px,+ Focusable, KeyContext, ListState, Modifiers, Pixels, Render, SharedString, Task, TaskExt,+ WeakEntity, Window, WindowHandle, linear_color_stop, linear_gradient, list, prelude::*, px,};use menu::{Cancel, Confirm, SelectChild, SelectFirst, SelectLast, SelectNext, SelectParent, SelectPrevious,diff --git a/crates/snippets_ui/src/snippets_ui.rs b/crates/snippets_ui/src/snippets_ui.rsindex c881d5276e6..ffb136f6252 100644--- a/crates/snippets_ui/src/snippets_ui.rs+++ b/crates/snippets_ui/src/snippets_ui.rs@@ -2,7 +2,7 @@ use file_icons::FileIcons;use fuzzy::{StringMatch, StringMatchCandidate, match_strings};use gpui::{App, Context, DismissEvent, Entity, EventEmitter, Focusable, ParentElement, Render, Styled,- WeakEntity, Window, actions,+ TaskExt, WeakEntity, Window, actions,};use language::{LanguageMatcher, LanguageName, LanguageRegistry};use open_path_prompt::file_finder_settings::FileFinderSettings;diff --git a/crates/tab_switcher/src/tab_switcher.rs b/crates/tab_switcher/src/tab_switcher.rsindex ac4087bb96b..67adf2583d8 100644--- a/crates/tab_switcher/src/tab_switcher.rs+++ b/crates/tab_switcher/src/tab_switcher.rs@@ -9,7 +9,7 @@ use fuzzy_nucleo::StringMatchCandidate;use gpui::{Action, AnyElement, App, Context, DismissEvent, Entity, EntityId, EventEmitter, FocusHandle,Focusable, Modifiers, ModifiersChangedEvent, MouseButton, MouseUpEvent, ParentElement, Point,- Render, Styled, Task, WeakEntity, Window, actions, rems,+ Render, Styled, Task, TaskExt, WeakEntity, Window, actions, rems,};use picker::{Picker, PickerDelegate};use project::Project;diff --git a/crates/task/src/static_source.rs b/crates/task/src/static_source.rsindex 9e4051ef972..a98d38a8eb8 100644--- a/crates/task/src/static_source.rs+++ b/crates/task/src/static_source.rs@@ -3,7 +3,7 @@use std::sync::Arc;use futures::{StreamExt, channel::mpsc::UnboundedSender};-use gpui::{App, AppContext};+use gpui::{App, AppContext, TaskExt};use parking_lot::RwLock;use serde::Deserialize;use util::ResultExt;diff --git a/crates/tasks_ui/src/tasks_ui.rs b/crates/tasks_ui/src/tasks_ui.rsindex ca8ebb5248e..072ad29c1b7 100644--- a/crates/tasks_ui/src/tasks_ui.rs+++ b/crates/tasks_ui/src/tasks_ui.rs@@ -2,7 +2,7 @@ use std::{path::Path, sync::Arc};use collections::HashMap;use editor::Editor;-use gpui::{App, AppContext as _, Context, Entity, Task, Window};+use gpui::{App, AppContext as _, Context, Entity, Task, TaskExt, Window};use project::{Location, TaskContexts, TaskSourceKind, Worktree};use task::{RevealTarget, TaskContext, TaskId, TaskTemplate, TaskVariables, VariableName};use workspace::Workspace;diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rsindex 642243ae147..4ad40b06e67 100644--- a/crates/terminal_view/src/terminal_panel.rs+++ b/crates/terminal_view/src/terminal_panel.rs@@ -12,8 +12,8 @@ use db::kvp::KeyValueStore;use futures::{channel::oneshot, future::join_all};use gpui::{Action, Anchor, AnyView, App, AsyncApp, AsyncWindowContext, Context, Entity, EventEmitter,- FocusHandle, Focusable, IntoElement, ParentElement, Pixels, Render, Styled, Task, WeakEntity,- Window, actions,+ FocusHandle, Focusable, IntoElement, ParentElement, Pixels, Render, Styled, Task, TaskExt,+ WeakEntity, Window, actions,};use itertools::Itertools;use project::{Fs, Project};diff --git a/crates/terminal_view/src/terminal_path_like_target.rs b/crates/terminal_view/src/terminal_path_like_target.rsindex f0f13d8fc2c..fb3abf41db7 100644--- a/crates/terminal_view/src/terminal_path_like_target.rs+++ b/crates/terminal_view/src/terminal_path_like_target.rs@@ -1,7 +1,7 @@use super::{HoverTarget, HoveredWord, TerminalView};use anyhow::{Context as _, Result};use editor::Editor;-use gpui::{App, AppContext, Context, Task, WeakEntity, Window};+use gpui::{App, AppContext, Context, Task, TaskExt, WeakEntity, Window};use itertools::Itertools;use project::{Entry, Metadata};use std::path::PathBuf;diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rsindex a6e28a95f50..07c638c1604 100644--- a/crates/terminal_view/src/terminal_view.rs+++ b/crates/terminal_view/src/terminal_view.rs@@ -11,8 +11,8 @@ use editor::{use gpui::{Action, AnyElement, App, ClipboardEntry, DismissEvent, Entity, EventEmitter, ExternalPaths,FocusHandle, Focusable, Font, KeyContext, KeyDownEvent, Keystroke, MouseButton, MouseDownEvent,- Pixels, Point, Render, ScrollWheelEvent, Styled, Subscription, Task, WeakEntity, actions,- anchored, deferred, div,+ Pixels, Point, Render, ScrollWheelEvent, Styled, Subscription, Task, TaskExt, WeakEntity,+ actions, anchored, deferred, div,};use itertools::Itertools;use menu;diff --git a/crates/title_bar/src/collab.rs b/crates/title_bar/src/collab.rsindex 474d0d287e4..72569b84fd4 100644--- a/crates/title_bar/src/collab.rs+++ b/crates/title_bar/src/collab.rs@@ -5,8 +5,8 @@ use call::{ActiveCall, Room};use channel::ChannelStore;use client::{User, proto::PeerId};use gpui::{- AnyElement, Hsla, IntoElement, MouseButton, Path, ScreenCaptureSource, Styled, WeakEntity,- canvas, point,+ AnyElement, Hsla, IntoElement, MouseButton, Path, ScreenCaptureSource, Styled, TaskExt,+ WeakEntity, canvas, point,};use gpui::{App, Task, Window};use icons::IconName;diff --git a/crates/title_bar/src/onboarding_banner.rs b/crates/title_bar/src/onboarding_banner.rsindex 96400a91a0a..24dccdc35b9 100644--- a/crates/title_bar/src/onboarding_banner.rs+++ b/crates/title_bar/src/onboarding_banner.rs@@ -2,7 +2,7 @@// It's currently not in use but is kept for future feature announcements.#![allow(dead_code)]-use gpui::{Action, Entity, Global, Render, SharedString};+use gpui::{Action, Entity, Global, Render, SharedString, TaskExt};use ui::{ButtonLike, Tooltip, prelude::*};use util::ResultExt;diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rsindex c6f82adcdf0..8e194218990 100644--- a/crates/title_bar/src/title_bar.rs+++ b/crates/title_bar/src/title_bar.rs@@ -29,7 +29,7 @@ use cloud_api_types::Plan;use gpui::{Action, Anchor, Animation, AnimationExt, AnyElement, App, Context, Element, Entity, Focusable,InteractiveElement, IntoElement, MouseButton, ParentElement, Render,- StatefulInteractiveElement, Styled, Subscription, WeakEntity, Window, actions, div,+ StatefulInteractiveElement, Styled, Subscription, TaskExt, WeakEntity, Window, actions, div,pulsating_between,};use onboarding_banner::OnboardingBanner;diff --git a/crates/ui/src/components/context_menu.rs b/crates/ui/src/components/context_menu.rsindex c8f330526df..ef21abaf3ec 100644--- a/crates/ui/src/components/context_menu.rs+++ b/crates/ui/src/components/context_menu.rs@@ -5,7 +5,7 @@ use crate::{use gpui::{Action, Anchor, AnyElement, App, Bounds, DismissEvent, Entity, EventEmitter, FocusHandle,Focusable, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Pixels, Point, Size,- Subscription, anchored, canvas, prelude::*, px,+ Subscription, TaskExt, anchored, canvas, prelude::*, px,};use menu::{SelectChild, SelectFirst, SelectLast, SelectNext, SelectParent, SelectPrevious};use std::{diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rsindex 6c10c321233..da7092db699 100644--- a/crates/vim/src/command.rs+++ b/crates/vim/src/command.rs@@ -8,7 +8,8 @@ use editor::{};use futures::AsyncWriteExt as _;use gpui::{- Action, App, AppContext as _, Context, Global, Keystroke, Task, WeakEntity, Window, actions,+ Action, App, AppContext as _, Context, Global, Keystroke, Task, TaskExt, WeakEntity, Window,+ actions,};use itertools::Itertools;use language::Point;diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rsindex 544a19167ac..796d69b2822 100644--- a/crates/vim/src/helix.rs+++ b/crates/vim/src/helix.rs@@ -11,7 +11,7 @@ use editor::{NavigationTargetOverlay, SelectionEffects, ToOffset, ToPoint, movement,};use gpui::actions;-use gpui::{App, Context, Font, Hsla, Pixels, Window, WindowTextSystem};+use gpui::{App, Context, Font, Hsla, Pixels, TaskExt, Window, WindowTextSystem};use language::{CharClassifier, CharKind, Point, Selection};use multi_buffer::MultiBufferSnapshot;use search::{BufferSearchBar, SearchOptions};diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rsindex 1d0d0812e82..e2ce1fb1284 100644--- a/crates/vim/src/normal.rs+++ b/crates/vim/src/normal.rs@@ -28,7 +28,7 @@ use editor::Editor;use editor::{Anchor, SelectionEffects};use editor::{Bias, ToPoint};use editor::{display_map::ToDisplayPoint, movement};-use gpui::{Context, Window, actions};+use gpui::{Context, TaskExt, Window, actions};use language::{AutoIndentMode, Point, SelectionGoal};use log::error;use multi_buffer::MultiBufferRow;diff --git a/crates/vim/src/normal/mark.rs b/crates/vim/src/normal/mark.rsindex 48cf8739b72..7f205a0fb8f 100644--- a/crates/vim/src/normal/mark.rs+++ b/crates/vim/src/normal/mark.rs@@ -5,7 +5,7 @@ use editor::{display_map::{DisplaySnapshot, ToDisplayPoint},movement,};-use gpui::{Context, Entity, EntityId, UpdateGlobal, Window};+use gpui::{Context, Entity, EntityId, TaskExt, UpdateGlobal, Window};use language::SelectionGoal;use text::Point;use ui::App;diff --git a/crates/vim/src/normal/search.rs b/crates/vim/src/normal/search.rsindex e7d17af1e3e..4fde2f786ce 100644--- a/crates/vim/src/normal/search.rs+++ b/crates/vim/src/normal/search.rs@@ -1,5 +1,5 @@use editor::{Editor, EditorSettings};-use gpui::{Action, Context, Window, actions};+use gpui::{Action, Context, TaskExt, Window, actions};use language::Point;use schemars::JsonSchema;use search::{BufferSearchBar, SearchOptions, buffer_search};diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rsindex 3ca4d704c7c..0851604e1ab 100644--- a/crates/vim/src/state.rs+++ b/crates/vim/src/state.rs@@ -15,7 +15,8 @@ use editor::display_map::{is_invisible, replacement};use editor::{Anchor, ClipboardSelection, Editor, MultiBuffer, ToPoint as EditorToPoint};use gpui::{Action, App, AppContext, BorrowAppContext, ClipboardEntry, ClipboardItem, DismissEvent, Entity,- EntityId, Global, HighlightStyle, StyledText, Subscription, Task, TextStyle, WeakEntity,+ EntityId, Global, HighlightStyle, StyledText, Subscription, Task, TaskExt, TextStyle,+ WeakEntity,};use language::{Buffer, BufferEvent, BufferId, Chunk, LanguageAwareStyling, Point};diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rsindex 5cd669473c7..573a6d9ac0a 100644--- a/crates/workspace/src/item.rs+++ b/crates/workspace/src/item.rs@@ -12,7 +12,7 @@ use client::{Client, proto};use futures::channel::mpsc;use gpui::{Action, AnyElement, AnyEntity, AnyView, App, AppContext, Context, Entity, EntityId,- EventEmitter, FocusHandle, Focusable, Font, Pixels, Point, Render, SharedString, Task,+ EventEmitter, FocusHandle, Focusable, Font, Pixels, Point, Render, SharedString, Task, TaskExt,WeakEntity, Window,};use language::Capability;diff --git a/crates/workspace/src/multi_workspace.rs b/crates/workspace/src/multi_workspace.rsindex 7916646311d..999b4d30413 100644--- a/crates/workspace/src/multi_workspace.rs+++ b/crates/workspace/src/multi_workspace.rs@@ -3,8 +3,8 @@ use fs::Fs;use gpui::{AnyView, App, Context, DragMoveEvent, Entity, EntityId, EventEmitter, FocusHandle, Focusable,- ManagedView, MouseButton, Pixels, Render, Subscription, Task, Tiling, WeakEntity, Window,- WindowId, actions, deferred, px,+ ManagedView, MouseButton, Pixels, Render, Subscription, Task, TaskExt, Tiling, WeakEntity,+ Window, WindowId, actions, deferred, px,};pub use project::ProjectGroupKey;use project::{DisableAiSettings, Project};diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rsindex aa6e53ef666..4a2204d4c5f 100644--- a/crates/workspace/src/pane.rs+++ b/crates/workspace/src/pane.rs@@ -21,8 +21,8 @@ use gpui::{Action, Anchor, AnyElement, App, AsyncWindowContext, ClickEvent, ClipboardItem, Context, Div,DragMoveEvent, Entity, EntityId, EventEmitter, ExternalPaths, FocusHandle, FocusOutEvent,Focusable, KeyContext, MouseButton, NavigationDirection, Pixels, Point, PromptLevel, Render,- ScrollHandle, Subscription, Task, WeakEntity, WeakFocusHandle, Window, actions, anchored,- deferred, prelude::*,+ ScrollHandle, Subscription, Task, TaskExt, WeakEntity, WeakFocusHandle, Window, actions,+ anchored, deferred, prelude::*,};use itertools::Itertools;use language::{Capability, DiagnosticSeverity};diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rsindex b1328aa3614..66af132b47c 100644--- a/crates/workspace/src/persistence.rs+++ b/crates/workspace/src/persistence.rs@@ -2759,6 +2759,7 @@ mod tests {read_multi_workspace_state,},};+ use gpui::TaskExt;use gpui::AppContext as _;use pretty_assertions::assert_eq;diff --git a/crates/workspace/src/tasks.rs b/crates/workspace/src/tasks.rsindex 3ea35678865..2d68d7d2ab0 100644--- a/crates/workspace/src/tasks.rs+++ b/crates/workspace/src/tasks.rs@@ -2,7 +2,7 @@ use std::process::ExitStatus;use anyhow::Result;use collections::HashSet;-use gpui::{AppContext, AsyncWindowContext, Context, Entity, Task, WeakEntity};+use gpui::{AppContext, AsyncWindowContext, Context, Entity, Task, TaskExt, WeakEntity};use language::Buffer;use project::{TaskSourceKind, WorktreeId};use remote::ConnectionState;diff --git a/crates/workspace/src/welcome.rs b/crates/workspace/src/welcome.rsindex 4110cffc46d..122cc468a45 100644--- a/crates/workspace/src/welcome.rs+++ b/crates/workspace/src/welcome.rs@@ -8,7 +8,7 @@ use agent_settings::AgentSettings;use git::Clone as GitClone;use gpui::{Action, App, Context, Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement,- ParentElement, Render, Styled, Task, Window, actions,+ ParentElement, Render, Styled, Task, TaskExt, Window, actions,};use gpui::{WeakEntity, linear_color_stop, linear_gradient};use menu::{SelectNext, SelectPrevious};diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rsindex 03b01cc79d8..bc675729f14 100644--- a/crates/workspace/src/workspace.rs+++ b/crates/workspace/src/workspace.rs@@ -63,8 +63,8 @@ use gpui::{Context, CursorStyle, Decorations, DragMoveEvent, Entity, EntityId, EventEmitter, FocusHandle,Focusable, Global, HitboxBehavior, Hsla, KeyContext, Keystroke, ManagedView, MouseButton,PathPromptOptions, Point, PromptLevel, Render, ResizeEdge, Size, Stateful, Subscription,- SystemWindowTabController, Task, Tiling, WeakEntity, WindowBounds, WindowHandle, WindowId,- WindowOptions, actions, canvas, point, relative, size, transparent_black,+ SystemWindowTabController, Task, TaskExt, Tiling, WeakEntity, WindowBounds, WindowHandle,+ WindowId, WindowOptions, actions, canvas, point, relative, size, transparent_black,};pub use history_manager::*;pub use item::{diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rsindex 8f417ee08ab..de49d220cd4 100644--- a/crates/zed/src/main.rs+++ b/crates/zed/src/main.rs@@ -22,8 +22,8 @@ use futures::{StreamExt, channel::oneshot, future};use git::GitHostingProviderRegistry;use git_ui::clone::clone_and_open;use gpui::{- App, AppContext, Application, AsyncApp, Focusable as _, QuitMode, Task, UpdateGlobal as _,- block_on,+ App, AppContext, Application, AsyncApp, Focusable as _, QuitMode, Task, TaskExt,+ UpdateGlobal as _, block_on,};use gpui_platform;diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rsindex b74cdebbacd..fd602d4ab50 100644--- a/crates/zed/src/reliability.rs+++ b/crates/zed/src/reliability.rs@@ -2,7 +2,7 @@ use anyhow::{Context as _, Result};use client::{Client, telemetry::MINIDUMP_ENDPOINT};use feature_flags::FeatureFlagAppExt;use futures::{AsyncReadExt, TryStreamExt};-use gpui::{App, AppContext as _, SerializedThreadTaskTimings};+use gpui::{App, AppContext as _, SerializedThreadTaskTimings, TaskExt};use http_client::{self, AsyncBody, HttpClient, Request};use log::info;use project::Project;diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rsindex 3afd117a015..180d85440df 100644--- a/crates/zed/src/zed.rs+++ b/crates/zed/src/zed.rs@@ -36,7 +36,7 @@ use git_ui::project_diff::{BranchDiffToolbar, ProjectDiffToolbar};use gpui::{Action, App, AppContext as _, AsyncWindowContext, ClipboardItem, Context, DismissEvent,Element, Entity, FocusHandle, Focusable, Image, ImageFormat, KeyBinding, ParentElement,- PathPromptOptions, PromptLevel, ReadGlobal, SharedString, Size, Task, TitlebarOptions,+ PathPromptOptions, PromptLevel, ReadGlobal, SharedString, Size, Task, TaskExt, TitlebarOptions,UpdateGlobal, WeakEntity, Window, WindowBounds, WindowHandle, WindowKind, WindowOptions,actions, image_cache, img, point, px, retain_all,};diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rsindex 6faf0d3fe68..18ea7c08697 100644--- a/crates/zed/src/zed/open_listener.rs+++ b/crates/zed/src/zed/open_listener.rs@@ -14,7 +14,7 @@ use futures::future;use futures::{FutureExt, StreamExt};use git_ui::{file_diff_view::FileDiffView, multi_diff_view::MultiDiffView};-use gpui::{App, AsyncApp, Global, WindowHandle};+use gpui::{App, AsyncApp, Global, TaskExt, WindowHandle};use onboarding::FIRST_OPEN;use onboarding::show_onboarding_view;use recent_projects::{RemoteSettings, navigate_to_positions, open_remote_project};diff --git a/crates/zed/src/zed/quick_action_bar/repl_menu.rs b/crates/zed/src/zed/quick_action_bar/repl_menu.rsindex 7502481b5b5..7b694281b99 100644--- a/crates/zed/src/zed/quick_action_bar/repl_menu.rs+++ b/crates/zed/src/zed/quick_action_bar/repl_menu.rs@@ -1,4 +1,5 @@use gpui::ElementId;+use gpui::TaskExt;use gpui::{AnyElement, Entity};use picker::Picker;use repl::{diff --git a/crates/zed/src/zed/remote_debug.rs b/crates/zed/src/zed/remote_debug.rsindex df91953c64c..e658248cdf8 100644--- a/crates/zed/src/zed/remote_debug.rs+++ b/crates/zed/src/zed/remote_debug.rs@@ -1,52 +1,53 @@-use workspace::Workspace;-use zed_actions::remote_debug::{SimulateDisconnect, SimulateTimeout, SimulateTimeoutExhausted};--pub fn init(cx: &mut gpui::App) {- cx.observe_new(|workspace: &mut Workspace, _, cx| {- let project = workspace.project().read(cx);- let Some(remote_client) = project.remote_client() else {- return;- };-- workspace.register_action({- let remote_client = remote_client.downgrade();- move |_, _: &SimulateDisconnect, _window, cx| {- let Some(remote_client) = remote_client.upgrade() else {- return;- };-- log::info!("SimulateDisconnect: forcing disconnect from remote server");- remote_client.update(cx, |client, cx| {- client.force_disconnect(cx).detach_and_log_err(cx);- });- }- });-- workspace.register_action({- let remote_client = remote_client.downgrade();- move |_, _: &SimulateTimeout, _window, cx| {- let Some(remote_client) = remote_client.upgrade() else {- return;- };-- log::info!("SimulateTimeout: forcing heartbeat timeout on remote connection");- remote_client.update(cx, |client, cx| {- client.force_heartbeat_timeout(0, cx);- });- }- });-- let remote_client = remote_client.downgrade();- workspace.register_action(move |_, _: &SimulateTimeoutExhausted, _window, cx| {- let Some(remote_client) = remote_client.upgrade() else {- return;- };-- log::info!("SimulateTimeout: forcing heartbeat timeout on remote connection");- remote_client.update(cx, |client, cx| {- client.force_heartbeat_timeout(remote::remote_client::MAX_RECONNECT_ATTEMPTS, cx);- });- });- })- .detach();-}+use gpui::TaskExt;+use workspace::Workspace;+use zed_actions::remote_debug::{SimulateDisconnect, SimulateTimeout, SimulateTimeoutExhausted};++pub fn init(cx: &mut gpui::App) {+ cx.observe_new(|workspace: &mut Workspace, _, cx| {+ let project = workspace.project().read(cx);+ let Some(remote_client) = project.remote_client() else {+ return;+ };++ workspace.register_action({+ let remote_client = remote_client.downgrade();+ move |_, _: &SimulateDisconnect, _window, cx| {+ let Some(remote_client) = remote_client.upgrade() else {+ return;+ };++ log::info!("SimulateDisconnect: forcing disconnect from remote server");+ remote_client.update(cx, |client, cx| {+ client.force_disconnect(cx).detach_and_log_err(cx);+ });+ }+ });++ workspace.register_action({+ let remote_client = remote_client.downgrade();+ move |_, _: &SimulateTimeout, _window, cx| {+ let Some(remote_client) = remote_client.upgrade() else {+ return;+ };++ log::info!("SimulateTimeout: forcing heartbeat timeout on remote connection");+ remote_client.update(cx, |client, cx| {+ client.force_heartbeat_timeout(0, cx);+ });+ }+ });++ let remote_client = remote_client.downgrade();+ workspace.register_action(move |_, _: &SimulateTimeoutExhausted, _window, cx| {+ let Some(remote_client) = remote_client.upgrade() else {+ return;+ };++ log::info!("SimulateTimeout: forcing heartbeat timeout on remote connection");+ remote_client.update(cx, |client, cx| {+ client.force_heartbeat_timeout(remote::remote_client::MAX_RECONNECT_ATTEMPTS, cx);+ });+ });+ })+ .detach();+}