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>
92 lines
2.8 KiB
Rust
92 lines
2.8 KiB
Rust
use anyhow::Result;
|
|
use gpui::{div, prelude::*, App, ClipboardItem, Context, Entity, Task, Window};
|
|
use language::Buffer;
|
|
use markdown_preview::{
|
|
markdown_elements::ParsedMarkdown, markdown_parser::parse_markdown,
|
|
markdown_renderer::render_markdown_block,
|
|
};
|
|
use ui::v_flex;
|
|
|
|
use crate::outputs::OutputContent;
|
|
|
|
pub struct MarkdownView {
|
|
raw_text: String,
|
|
contents: Option<ParsedMarkdown>,
|
|
parsing_markdown_task: Option<Task<Result<()>>>,
|
|
}
|
|
|
|
impl MarkdownView {
|
|
pub fn from(text: String, cx: &mut Context<Self>) -> Self {
|
|
let task = cx.spawn(|markdown_view, mut cx| {
|
|
let text = text.clone();
|
|
let parsed = cx
|
|
.background_executor()
|
|
.spawn(async move { parse_markdown(&text, None, None).await });
|
|
|
|
async move {
|
|
let content = parsed.await;
|
|
|
|
markdown_view.update(&mut cx, |markdown, cx| {
|
|
markdown.parsing_markdown_task.take();
|
|
markdown.contents = Some(content);
|
|
cx.notify();
|
|
})
|
|
}
|
|
});
|
|
|
|
Self {
|
|
raw_text: text.clone(),
|
|
contents: None,
|
|
parsing_markdown_task: Some(task),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl OutputContent for MarkdownView {
|
|
fn clipboard_content(&self, _window: &Window, _cx: &App) -> Option<ClipboardItem> {
|
|
Some(ClipboardItem::new_string(self.raw_text.clone()))
|
|
}
|
|
|
|
fn has_clipboard_content(&self, _window: &Window, _cx: &App) -> bool {
|
|
true
|
|
}
|
|
|
|
fn has_buffer_content(&self, _window: &Window, _cx: &App) -> bool {
|
|
true
|
|
}
|
|
|
|
fn buffer_content(&mut self, _: &mut Window, cx: &mut App) -> Option<Entity<Buffer>> {
|
|
let buffer = cx.new(|cx| {
|
|
// TODO: Bring in the language registry so we can set the language to markdown
|
|
let mut buffer = Buffer::local(self.raw_text.clone(), cx)
|
|
.with_language(language::PLAIN_TEXT.clone(), cx);
|
|
buffer.set_capability(language::Capability::ReadOnly, cx);
|
|
buffer
|
|
});
|
|
Some(buffer)
|
|
}
|
|
}
|
|
|
|
impl Render for MarkdownView {
|
|
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
let Some(parsed) = self.contents.as_ref() else {
|
|
return div().into_any_element();
|
|
};
|
|
|
|
let mut markdown_render_context =
|
|
markdown_preview::markdown_renderer::RenderContext::new(None, window, cx);
|
|
|
|
v_flex()
|
|
.gap_3()
|
|
.py_4()
|
|
.children(parsed.children.iter().map(|child| {
|
|
div().relative().child(
|
|
div()
|
|
.relative()
|
|
.child(render_markdown_block(child, &mut markdown_render_context)),
|
|
)
|
|
}))
|
|
.into_any_element()
|
|
}
|
|
}
|