Eliminate GPUI View, ViewContext, and WindowContext types (#22632)

There's still a bit more work to do on this, but this PR is compiling
(with warnings) after eliminating the key types. When the tasks below
are complete, this will be the new narrative for GPUI:

- `Entity<T>` - This replaces `View<T>`/`Model<T>`. It represents a unit
of state, and if `T` implements `Render`, then `Entity<T>` implements
`Element`.
- `&mut App` This replaces `AppContext` and represents the app.
- `&mut Context<T>` This replaces `ModelContext` and derefs to `App`. It
is provided by the framework when updating an entity.
- `&mut Window` Broken out of `&mut WindowContext` which no longer
exists. Every method that once took `&mut WindowContext` now takes `&mut
Window, &mut App` and every method that took `&mut ViewContext<T>` now
takes `&mut Window, &mut Context<T>`

Not pictured here are the two other failed attempts. It's been quite a
month!

Tasks:

- [x] Remove `View`, `ViewContext`, `WindowContext` and thread through
`Window`
- [x] [@cole-miller @mikayla-maki] Redraw window when entities change
- [x] [@cole-miller @mikayla-maki] Get examples and Zed running
- [x] [@cole-miller @mikayla-maki] Fix Zed rendering
- [x] [@mikayla-maki] Fix todo! macros and comments
- [x] Fix a bug where the editor would not be redrawn because of view
caching
- [x] remove publicness window.notify() and replace with
`AppContext::notify`
- [x] remove `observe_new_window_models`, replace with
`observe_new_models` with an optional window
- [x] Fix a bug where the project panel would not be redrawn because of
the wrong refresh() call being used
- [x] Fix the tests
- [x] Fix warnings by eliminating `Window` params or using `_`
- [x] Fix conflicts
- [x] Simplify generic code where possible
- [x] Rename types
- [ ] Update docs

### issues post merge

- [x] Issues switching between normal and insert mode
- [x] Assistant re-rendering failure
- [x] Vim test failures
- [x] Mac build issue



Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Joseph <joseph@zed.dev>
Co-authored-by: max <max@zed.dev>
Co-authored-by: Michael Sloan <michael@zed.dev>
Co-authored-by: Mikayla Maki <mikaylamaki@Mikaylas-MacBook-Pro.local>
Co-authored-by: Mikayla <mikayla.c.maki@gmail.com>
Co-authored-by: joão <joao@zed.dev>

crates/language_model/src/fake_provider.rs

@@ -4,7 +4,7 @@ use crate::{
     LanguageModelProviderState, LanguageModelRequest,
 };
 use futures::{channel::mpsc, future::BoxFuture, stream::BoxStream, FutureExt, StreamExt};
-use gpui::{AnyView, AppContext, AsyncAppContext, Model, Task, WindowContext};
+use gpui::{AnyView, App, AsyncAppContext, Entity, Task, Window};
 use http_client::Result;
 use parking_lot::Mutex;
 use serde::Serialize;
@@ -32,7 +32,7 @@ pub struct FakeLanguageModelProvider;
 impl LanguageModelProviderState for FakeLanguageModelProvider {
     type ObservableEntity = ();
 
-    fn observable_entity(&self) -> Option<Model<Self::ObservableEntity>> {
+    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
         None
     }
 }
@@ -46,23 +46,23 @@ impl LanguageModelProvider for FakeLanguageModelProvider {
         provider_name()
     }
 
-    fn provided_models(&self, _: &AppContext) -> Vec<Arc<dyn LanguageModel>> {
+    fn provided_models(&self, _: &App) -> Vec<Arc<dyn LanguageModel>> {
         vec![Arc::new(FakeLanguageModel::default())]
     }
 
-    fn is_authenticated(&self, _: &AppContext) -> bool {
+    fn is_authenticated(&self, _: &App) -> bool {
         true
     }
 
-    fn authenticate(&self, _: &mut AppContext) -> Task<Result<()>> {
+    fn authenticate(&self, _: &mut App) -> Task<Result<()>> {
         Task::ready(Ok(()))
     }
 
-    fn configuration_view(&self, _: &mut WindowContext) -> AnyView {
+    fn configuration_view(&self, _window: &mut Window, _: &mut App) -> AnyView {
         unimplemented!()
     }
 
-    fn reset_credentials(&self, _: &mut AppContext) -> Task<Result<()>> {
+    fn reset_credentials(&self, _: &mut App) -> Task<Result<()>> {
         Task::ready(Ok(()))
     }
 }
@@ -157,11 +157,7 @@ impl LanguageModel for FakeLanguageModel {
         1000000
     }
 
-    fn count_tokens(
-        &self,
-        _: LanguageModelRequest,
-        _: &AppContext,
-    ) -> BoxFuture<'static, Result<usize>> {
+    fn count_tokens(&self, _: LanguageModelRequest, _: &App) -> BoxFuture<'static, Result<usize>> {
         futures::future::ready(Ok(0)).boxed()
     }
 

crates/language_model/src/language_model.rs

@@ -10,7 +10,7 @@ pub mod fake_provider;
 use anyhow::Result;
 use futures::FutureExt;
 use futures::{future::BoxFuture, stream::BoxStream, StreamExt, TryStreamExt as _};
-use gpui::{AnyElement, AnyView, AppContext, AsyncAppContext, SharedString, Task, WindowContext};
+use gpui::{AnyElement, AnyView, App, AsyncAppContext, SharedString, Task, Window};
 pub use model::*;
 use proto::Plan;
 pub use rate_limiter::*;
@@ -25,7 +25,7 @@ use ui::IconName;
 
 pub const ZED_CLOUD_PROVIDER_ID: &str = "zed.dev";
 
-pub fn init(cx: &mut AppContext) {
+pub fn init(cx: &mut App) {
     registry::init(cx);
 }
 
@@ -113,7 +113,7 @@ pub trait LanguageModel: Send + Sync {
     fn provider_name(&self) -> LanguageModelProviderName;
     fn telemetry_id(&self) -> String;
 
-    fn api_key(&self, _cx: &AppContext) -> Option<String> {
+    fn api_key(&self, _cx: &App) -> Option<String> {
         None
     }
 
@@ -130,7 +130,7 @@ pub trait LanguageModel: Send + Sync {
     fn count_tokens(
         &self,
         request: LanguageModelRequest,
-        cx: &AppContext,
+        cx: &App,
     ) -> BoxFuture<'static, Result<usize>>;
 
     fn stream_completion(
@@ -237,22 +237,22 @@ pub trait LanguageModelProvider: 'static {
     fn icon(&self) -> IconName {
         IconName::ZedAssistant
     }
-    fn provided_models(&self, cx: &AppContext) -> Vec<Arc<dyn LanguageModel>>;
-    fn load_model(&self, _model: Arc<dyn LanguageModel>, _cx: &AppContext) {}
-    fn is_authenticated(&self, cx: &AppContext) -> bool;
-    fn authenticate(&self, cx: &mut AppContext) -> Task<Result<()>>;
-    fn configuration_view(&self, cx: &mut WindowContext) -> AnyView;
-    fn must_accept_terms(&self, _cx: &AppContext) -> bool {
+    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>>;
+    fn load_model(&self, _model: Arc<dyn LanguageModel>, _cx: &App) {}
+    fn is_authenticated(&self, cx: &App) -> bool;
+    fn authenticate(&self, cx: &mut App) -> Task<Result<()>>;
+    fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView;
+    fn must_accept_terms(&self, _cx: &App) -> bool {
         false
     }
     fn render_accept_terms(
         &self,
         _view: LanguageModelProviderTosView,
-        _cx: &mut WindowContext,
+        _cx: &mut App,
     ) -> Option<AnyElement> {
         None
     }
-    fn reset_credentials(&self, cx: &mut AppContext) -> Task<Result<()>>;
+    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>>;
 }
 
 #[derive(PartialEq, Eq)]
@@ -265,12 +265,12 @@ pub enum LanguageModelProviderTosView {
 pub trait LanguageModelProviderState: 'static {
     type ObservableEntity;
 
-    fn observable_entity(&self) -> Option<gpui::Model<Self::ObservableEntity>>;
+    fn observable_entity(&self) -> Option<gpui::Entity<Self::ObservableEntity>>;
 
     fn subscribe<T: 'static>(
         &self,
-        cx: &mut gpui::ModelContext<T>,
-        callback: impl Fn(&mut T, &mut gpui::ModelContext<T>) + 'static,
+        cx: &mut gpui::Context<T>,
+        callback: impl Fn(&mut T, &mut gpui::Context<T>) + 'static,
     ) -> Option<gpui::Subscription> {
         let entity = self.observable_entity()?;
         Some(cx.observe(&entity, move |this, _, cx| {

crates/language_model/src/registry.rs

@@ -3,15 +3,15 @@ use crate::{
     LanguageModelProviderState,
 };
 use collections::BTreeMap;
-use gpui::{prelude::*, AppContext, EventEmitter, Global, Model, ModelContext};
+use gpui::{prelude::*, App, Context, Entity, EventEmitter, Global};
 use std::sync::Arc;
 
-pub fn init(cx: &mut AppContext) {
-    let registry = cx.new_model(|_cx| LanguageModelRegistry::default());
+pub fn init(cx: &mut App) {
+    let registry = cx.new(|_cx| LanguageModelRegistry::default());
     cx.set_global(GlobalLanguageModelRegistry(registry));
 }
 
-struct GlobalLanguageModelRegistry(Model<LanguageModelRegistry>);
+struct GlobalLanguageModelRegistry(Entity<LanguageModelRegistry>);
 
 impl Global for GlobalLanguageModelRegistry {}
 
@@ -37,18 +37,18 @@ pub enum Event {
 impl EventEmitter<Event> for LanguageModelRegistry {}
 
 impl LanguageModelRegistry {
-    pub fn global(cx: &AppContext) -> Model<Self> {
+    pub fn global(cx: &App) -> Entity<Self> {
         cx.global::<GlobalLanguageModelRegistry>().0.clone()
     }
 
-    pub fn read_global(cx: &AppContext) -> &Self {
+    pub fn read_global(cx: &App) -> &Self {
         cx.global::<GlobalLanguageModelRegistry>().0.read(cx)
     }
 
     #[cfg(any(test, feature = "test-support"))]
-    pub fn test(cx: &mut AppContext) -> crate::fake_provider::FakeLanguageModelProvider {
+    pub fn test(cx: &mut App) -> crate::fake_provider::FakeLanguageModelProvider {
         let fake_provider = crate::fake_provider::FakeLanguageModelProvider;
-        let registry = cx.new_model(|cx| {
+        let registry = cx.new(|cx| {
             let mut registry = Self::default();
             registry.register_provider(fake_provider.clone(), cx);
             let model = fake_provider.provided_models(cx)[0].clone();
@@ -62,7 +62,7 @@ impl LanguageModelRegistry {
     pub fn register_provider<T: LanguageModelProvider + LanguageModelProviderState>(
         &mut self,
         provider: T,
-        cx: &mut ModelContext<Self>,
+        cx: &mut Context<Self>,
     ) {
         let id = provider.id();
 
@@ -77,11 +77,7 @@ impl LanguageModelRegistry {
         cx.emit(Event::AddedProvider(id));
     }
 
-    pub fn unregister_provider(
-        &mut self,
-        id: LanguageModelProviderId,
-        cx: &mut ModelContext<Self>,
-    ) {
+    pub fn unregister_provider(&mut self, id: LanguageModelProviderId, cx: &mut Context<Self>) {
         if self.providers.remove(&id).is_some() {
             cx.emit(Event::RemovedProvider(id));
         }
@@ -105,7 +101,7 @@ impl LanguageModelRegistry {
 
     pub fn available_models<'a>(
         &'a self,
-        cx: &'a AppContext,
+        cx: &'a App,
     ) -> impl Iterator<Item = Arc<dyn LanguageModel>> + 'a {
         self.providers
             .values()
@@ -120,7 +116,7 @@ impl LanguageModelRegistry {
         &mut self,
         provider: &LanguageModelProviderId,
         model_id: &LanguageModelId,
-        cx: &mut ModelContext<Self>,
+        cx: &mut Context<Self>,
     ) {
         let Some(provider) = self.provider(provider) else {
             return;
@@ -135,7 +131,7 @@ impl LanguageModelRegistry {
     pub fn set_active_provider(
         &mut self,
         provider: Option<Arc<dyn LanguageModelProvider>>,
-        cx: &mut ModelContext<Self>,
+        cx: &mut Context<Self>,
     ) {
         self.active_model = provider.map(|provider| ActiveModel {
             provider,
@@ -147,7 +143,7 @@ impl LanguageModelRegistry {
     pub fn set_active_model(
         &mut self,
         model: Option<Arc<dyn LanguageModel>>,
-        cx: &mut ModelContext<Self>,
+        cx: &mut Context<Self>,
     ) {
         if let Some(model) = model {
             let provider_id = model.provider_id();
@@ -179,7 +175,7 @@ impl LanguageModelRegistry {
     pub fn select_inline_alternative_models(
         &mut self,
         alternatives: impl IntoIterator<Item = (LanguageModelProviderId, LanguageModelId)>,
-        cx: &mut ModelContext<Self>,
+        cx: &mut Context<Self>,
     ) {
         let mut selected_alternatives = Vec::new();
 
@@ -212,8 +208,8 @@ mod tests {
     use crate::fake_provider::FakeLanguageModelProvider;
 
     #[gpui::test]
-    fn test_register_providers(cx: &mut AppContext) {
-        let registry = cx.new_model(|_| LanguageModelRegistry::default());
+    fn test_register_providers(cx: &mut App) {
+        let registry = cx.new(|_| LanguageModelRegistry::default());
 
         registry.update(cx, |registry, cx| {
             registry.register_provider(FakeLanguageModelProvider, cx);

crates/language_model/src/request.rs

@@ -3,7 +3,7 @@ use std::io::{Cursor, Write};
 use crate::role::Role;
 use crate::LanguageModelToolUse;
 use base64::write::EncoderWriter;
-use gpui::{point, size, AppContext, DevicePixels, Image, ObjectFit, RenderImage, Size, Task};
+use gpui::{point, size, App, DevicePixels, Image, ObjectFit, RenderImage, Size, Task};
 use image::{codecs::png::PngEncoder, imageops::resize, DynamicImage, ImageDecoder};
 use serde::{Deserialize, Serialize};
 use ui::{px, SharedString};
@@ -29,7 +29,7 @@ impl std::fmt::Debug for LanguageModelImage {
 const ANTHROPIC_SIZE_LIMT: f32 = 1568.;
 
 impl LanguageModelImage {
-    pub fn from_image(data: Image, cx: &mut AppContext) -> Task<Option<Self>> {
+    pub fn from_image(data: Image, cx: &mut App) -> Task<Option<Self>> {
         cx.background_executor().spawn(async move {
             match data.format() {
                 gpui::ImageFormat::Png