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>
This commit is contained in:
parent
21b4a0d50e
commit
6fca1d2b0b
648 changed files with 36248 additions and 28208 deletions
|
@ -6,10 +6,10 @@ use std::any::TypeId;
|
|||
|
||||
use collections::HashSet;
|
||||
use derive_more::{Deref, DerefMut};
|
||||
use gpui::{Action, AppContext, BorrowAppContext, Global};
|
||||
use gpui::{Action, App, BorrowAppContext, Global};
|
||||
|
||||
/// Initializes the command palette hooks.
|
||||
pub fn init(cx: &mut AppContext) {
|
||||
pub fn init(cx: &mut App) {
|
||||
cx.set_global(GlobalCommandPaletteFilter::default());
|
||||
cx.set_global(GlobalCommandPaletteInterceptor::default());
|
||||
}
|
||||
|
@ -31,20 +31,20 @@ impl Global for GlobalCommandPaletteFilter {}
|
|||
|
||||
impl CommandPaletteFilter {
|
||||
/// Returns the global [`CommandPaletteFilter`], if one is set.
|
||||
pub fn try_global(cx: &AppContext) -> Option<&CommandPaletteFilter> {
|
||||
pub fn try_global(cx: &App) -> Option<&CommandPaletteFilter> {
|
||||
cx.try_global::<GlobalCommandPaletteFilter>()
|
||||
.map(|filter| &filter.0)
|
||||
}
|
||||
|
||||
/// Returns a mutable reference to the global [`CommandPaletteFilter`].
|
||||
pub fn global_mut(cx: &mut AppContext) -> &mut Self {
|
||||
pub fn global_mut(cx: &mut App) -> &mut Self {
|
||||
cx.global_mut::<GlobalCommandPaletteFilter>()
|
||||
}
|
||||
|
||||
/// Updates the global [`CommandPaletteFilter`] using the given closure.
|
||||
pub fn update_global<F>(cx: &mut AppContext, update: F)
|
||||
pub fn update_global<F>(cx: &mut App, update: F)
|
||||
where
|
||||
F: FnOnce(&mut Self, &mut AppContext),
|
||||
F: FnOnce(&mut Self, &mut App),
|
||||
{
|
||||
if cx.has_global::<GlobalCommandPaletteFilter>() {
|
||||
cx.update_global(|this: &mut GlobalCommandPaletteFilter, cx| update(&mut this.0, cx))
|
||||
|
@ -93,6 +93,7 @@ impl CommandPaletteFilter {
|
|||
}
|
||||
|
||||
/// The result of intercepting a command palette command.
|
||||
#[derive(Debug)]
|
||||
pub struct CommandInterceptResult {
|
||||
/// The action produced as a result of the interception.
|
||||
pub action: Box<dyn Action>,
|
||||
|
@ -107,7 +108,7 @@ pub struct CommandInterceptResult {
|
|||
/// An interceptor for the command palette.
|
||||
#[derive(Default)]
|
||||
pub struct CommandPaletteInterceptor(
|
||||
Option<Box<dyn Fn(&str, &AppContext) -> Option<CommandInterceptResult>>>,
|
||||
Option<Box<dyn Fn(&str, &App) -> Option<CommandInterceptResult>>>,
|
||||
);
|
||||
|
||||
#[derive(Default)]
|
||||
|
@ -117,21 +118,21 @@ impl Global for GlobalCommandPaletteInterceptor {}
|
|||
|
||||
impl CommandPaletteInterceptor {
|
||||
/// Returns the global [`CommandPaletteInterceptor`], if one is set.
|
||||
pub fn try_global(cx: &AppContext) -> Option<&CommandPaletteInterceptor> {
|
||||
pub fn try_global(cx: &App) -> Option<&CommandPaletteInterceptor> {
|
||||
cx.try_global::<GlobalCommandPaletteInterceptor>()
|
||||
.map(|interceptor| &interceptor.0)
|
||||
}
|
||||
|
||||
/// Updates the global [`CommandPaletteInterceptor`] using the given closure.
|
||||
pub fn update_global<F, R>(cx: &mut AppContext, update: F) -> R
|
||||
pub fn update_global<F, R>(cx: &mut App, update: F) -> R
|
||||
where
|
||||
F: FnOnce(&mut Self, &mut AppContext) -> R,
|
||||
F: FnOnce(&mut Self, &mut App) -> R,
|
||||
{
|
||||
cx.update_global(|this: &mut GlobalCommandPaletteInterceptor, cx| update(&mut this.0, cx))
|
||||
}
|
||||
|
||||
/// Intercepts the given query from the command palette.
|
||||
pub fn intercept(&self, query: &str, cx: &AppContext) -> Option<CommandInterceptResult> {
|
||||
pub fn intercept(&self, query: &str, cx: &App) -> Option<CommandInterceptResult> {
|
||||
let handler = self.0.as_ref()?;
|
||||
|
||||
(handler)(query, cx)
|
||||
|
@ -145,10 +146,7 @@ impl CommandPaletteInterceptor {
|
|||
/// Sets the global interceptor.
|
||||
///
|
||||
/// This will override the previous interceptor, if it exists.
|
||||
pub fn set(
|
||||
&mut self,
|
||||
handler: Box<dyn Fn(&str, &AppContext) -> Option<CommandInterceptResult>>,
|
||||
) {
|
||||
pub fn set(&mut self, handler: Box<dyn Fn(&str, &App) -> Option<CommandInterceptResult>>) {
|
||||
self.0 = Some(handler);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue