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

Convert rich_text2

Browse source
This commit is contained in:
Conrad Irwin 2023-11-02 19:30:33 -06:00
parent 6ecb4805f7
commit 0b3932f38c
4 changed files with 59 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/rich_text2/src/rich_text.rs
View file

@ -2,14 +2,8 @@ use std::{ops::Range, sync::Arc};
use anyhow::bail;
use futures::FutureExt;
use gpui::{
elements::Text,
fonts::{HighlightStyle, Underline, Weight},
platform::{CursorStyle, MouseButton},
AnyElement, CursorRegion, Element, MouseRegion, ViewContext,
};
use gpui::{AnyElement, FontStyle, FontWeight, HighlightStyle, UnderlineStyle};
use language::{HighlightId, Language, LanguageRegistry};
use theme::{RichTextStyle, SyntaxTheme};
use util::RangeExt;
#[derive(Debug, Clone, PartialEq, Eq)]
@ -64,9 +58,9 @@ pub struct Mention {
impl RichText {
pub fn element<V: 'static>(
&self,
syntax: Arc<SyntaxTheme>,
style: RichTextStyle,
cx: &mut ViewContext<V>,
// syntax: Arc<SyntaxTheme>,
// style: RichTextStyle,
// cx: &mut ViewContext<V>,
) -> AnyElement<V> {
todo!();
@ -203,10 +197,10 @@ pub fn render_markdown_mut(
data.text.push_str(t.as_ref());
let mut style = HighlightStyle::default();
if bold_depth > 0 {
style.weight = Some(Weight::BOLD);
style.font_weight = Some(FontWeight::BOLD);
}
if italic_depth > 0 {
style.italic = Some(true);
style.font_style = Some(FontStyle::Italic);
}
if let Some(link_url) = link_url.clone() {
data.region_ranges.push(prev_len..data.text.len());
@ -214,7 +208,7 @@ pub fn render_markdown_mut(
link_url: Some(link_url),
background_kind: None,
});
style.underline = Some(Underline {
style.underline = Some(UnderlineStyle {
thickness: 1.0.into(),
..Default::default()
});
@ -244,7 +238,7 @@ pub fn render_markdown_mut(
data.highlights.push((
prev_len..data.text.len(),
Highlight::Highlight(HighlightStyle {
underline: Some(Underline {
underline: Some(UnderlineStyle {
thickness: 1.0.into(),
..Default::default()
}),