Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove language::markdown (#25136)

Browse source 
The language::markdown crate had been superceded by markdown::Mardown.

After #25117, the only two remaining use-cases were rendering git commit
messages (which are arguably not really markdown) and the signature help
(which is definitely not markdown).

Updated the former to use the new markdown component, and the latter to
do syntax highlighting manually.

Release Notes:

- Allow selecting the commit message in git commits
This commit is contained in:
Conrad Irwin 2025-02-19 08:55:36 -07:00 • committed by GitHub
parent 686978d7c5
commit 119bd896b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 348 additions and 947 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/markdown/examples/markdown.rs
View file

@ -46,7 +46,7 @@ pub fn main() {
Assets.load_fonts(cx).unwrap();
cx.activate(true);
cx.open_window(WindowOptions::default(), |window, cx| {
cx.open_window(WindowOptions::default(), |_, cx| {
cx.new(|cx| {
let markdown_style = MarkdownStyle {
base_text_style: gpui::TextStyle {
@ -92,7 +92,6 @@ pub fn main() {
MARKDOWN_EXAMPLE.into(),
markdown_style,
language_registry,
window,
cx,
)
})
@ -110,7 +109,6 @@ impl MarkdownExample {
text: SharedString,
style: MarkdownStyle,
language_registry: Arc<LanguageRegistry>,
window: &mut Window,
cx: &mut App,
) -> Self {
let markdown = cx.new(|cx| {
@ -119,7 +117,6 @@ impl MarkdownExample {
style,
Some(language_registry),
Some("TypeScript".to_string()),
window,
cx,
)
});

11
crates/markdown/examples/markdown_as_child.rs
View file

@ -35,7 +35,7 @@ pub fn main() {
Assets.load_fonts(cx).unwrap();
cx.activate(true);
let _ = cx.open_window(WindowOptions::default(), |window, cx| {
let _ = cx.open_window(WindowOptions::default(), |_, cx| {
cx.new(|cx| {
let markdown_style = MarkdownStyle {
base_text_style: gpui::TextStyle {
@ -86,14 +86,7 @@ pub fn main() {
heading: Default::default(),
};
let markdown = cx.new(|cx| {
Markdown::new(
MARKDOWN_EXAMPLE.into(),
markdown_style,
None,
None,
window,
cx,
)
Markdown::new(MARKDOWN_EXAMPLE.into(), markdown_style, None, None, cx)
});
HelloWorld { markdown }

38
crates/markdown/src/markdown.rs
View file

@ -77,7 +77,6 @@ impl Markdown {
style: MarkdownStyle,
language_registry: Option<Arc<LanguageRegistry>>,
fallback_code_block_language: Option<String>,
window: &mut Window,
cx: &mut Context<Self>,
) -> Self {
let focus_handle = cx.focus_handle();
@ -99,7 +98,7 @@ impl Markdown {
},
open_url: None,
};
this.parse(window, cx);
this.parse(cx);
this
}
@ -113,14 +112,7 @@ impl Markdown {
}
}
pub fn new_text(
source: SharedString,
style: MarkdownStyle,
language_registry: Option<Arc<LanguageRegistry>>,
fallback_code_block_language: Option<String>,
window: &mut Window,
cx: &mut Context<Self>,
) -> Self {
pub fn new_text(source: SharedString, style: MarkdownStyle, cx: &mut Context<Self>) -> Self {
let focus_handle = cx.focus_handle();
let mut this = Self {
source,
@ -132,15 +124,15 @@ impl Markdown {
parsed_markdown: ParsedMarkdown::default(),
pending_parse: None,
focus_handle,
language_registry,
fallback_code_block_language,
language_registry: None,
fallback_code_block_language: None,
options: Options {
parse_links_only: true,
copy_code_block_buttons: true,
},
open_url: None,
};
this.parse(window, cx);
this.parse(cx);
this
}
@ -148,12 +140,12 @@ impl Markdown {
&self.source
}
pub fn append(&mut self, text: &str, window: &mut Window, cx: &mut Context<Self>) {
pub fn append(&mut self, text: &str, cx: &mut Context<Self>) {
self.source = SharedString::new(self.source.to_string() + text);
self.parse(window, cx);
self.parse(cx);
}
pub fn reset(&mut self, source: SharedString, window: &mut Window, cx: &mut Context<Self>) {
pub fn reset(&mut self, source: SharedString, cx: &mut Context<Self>) {
if source == self.source() {
return;
}
@ -163,7 +155,7 @@ impl Markdown {
self.pending_parse = None;
self.should_reparse = false;
self.parsed_markdown = ParsedMarkdown::default();
self.parse(window, cx);
self.parse(cx);
}
pub fn parsed_markdown(&self) -> &ParsedMarkdown {
@ -178,7 +170,7 @@ impl Markdown {
cx.write_to_clipboard(ClipboardItem::new_string(text));
}
fn parse(&mut self, window: &mut Window, cx: &mut Context<Self>) {
fn parse(&mut self, cx: &mut Context<Self>) {
if self.source.is_empty() {
return;
}
@ -224,14 +216,14 @@ impl Markdown {
});
self.should_reparse = false;
self.pending_parse = Some(cx.spawn_in(window, |this, mut cx| {
self.pending_parse = Some(cx.spawn(|this, mut cx| {
async move {
let parsed = parsed.await?;
this.update_in(&mut cx, |this, window, cx| {
this.update(&mut cx, |this, cx| {
this.parsed_markdown = parsed;
this.pending_parse.take();
if this.should_reparse {
this.parse(window, cx);
this.parse(cx);
}
cx.notify();
})
@ -294,7 +286,7 @@ impl Selection {
}
}
#[derive(Clone, Default)]
#[derive(Default)]
pub struct ParsedMarkdown {
source: SharedString,
events: Arc<[(Range<usize>, MarkdownEvent)]>,
@ -554,7 +546,7 @@ impl Element for MarkdownElement {
self.style.base_text_style.clone(),
self.style.syntax.clone(),
);
let parsed_markdown = self.markdown.read(cx).parsed_markdown.clone();
let parsed_markdown = &self.markdown.read(cx).parsed_markdown;
let markdown_end = if let Some(last) = parsed_markdown.events.last() {
last.0.end
} else {