Merge branch 'main' into zed2-breadcrumbs

This commit is contained in:
Julia 2023-11-30 11:38:29 -05:00
commit 428c517693
197 changed files with 11947 additions and 8365 deletions

View file

@ -2,7 +2,7 @@ use std::ops::Range;
use crate::prelude::*;
use crate::styled_ext::StyledExt;
use gpui::{relative, Div, HighlightStyle, Hsla, IntoElement, StyledText, WindowContext};
use gpui::{relative, Div, HighlightStyle, IntoElement, StyledText, WindowContext};
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)]
pub enum LabelSize {
@ -178,9 +178,3 @@ impl HighlightedLabel {
self
}
}
/// A run of text that receives the same style.
struct Run {
pub text: String,
pub color: Hsla,
}