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

Represent theme's syntax colors with string keys

Browse source 
Co-authored-by: Marshall Bowers <marshall@zed.dev>
This commit is contained in:
Max Brunsfeld 2023-10-26 16:38:29 +02:00
parent a569c82492
commit 0eae962abf
10 changed files with 156 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/ui2/src/components/breadcrumb.rs
View file

@ -1,8 +1,8 @@
use std::path::PathBuf;
use gpui2::Div;
use crate::prelude::*;
use crate::{h_stack, HighlightedText};
use gpui2::Div;
#[derive(Clone)]
pub struct Symbol(pub Vec<HighlightedText>);
@ -15,10 +15,7 @@ pub struct Breadcrumb {
impl Breadcrumb {
pub fn new(path: PathBuf, symbols: Vec<Symbol>) -> Self {
Self {
path,
symbols,
}
Self { path, symbols }
}
fn render_separator<V: 'static>(&self, cx: &WindowContext) -> Div<V> {
@ -90,7 +87,11 @@ mod stories {
Self
}
fn render<V: 'static>(self, view_state: &mut V, cx: &mut ViewContext<V>) -> impl Component<V> {
fn render<V: 'static>(
self,
view_state: &mut V,
cx: &mut ViewContext<V>,
) -> impl Component<V> {
let theme = theme(cx);
Story::container(cx)
@ -102,21 +103,21 @@ mod stories {
Symbol(vec![
HighlightedText {
text: "impl ".to_string(),
color: theme.syntax.keyword,
color: theme.syntax.color("keyword"),
},
HighlightedText {
text: "BreadcrumbStory".to_string(),
color: theme.syntax.function,
color: theme.syntax.color("function"),
},
]),
Symbol(vec![
HighlightedText {
text: "fn ".to_string(),
color: theme.syntax.keyword,
color: theme.syntax.color("keyword"),
},
HighlightedText {
text: "render".to_string(),
color: theme.syntax.function,
color: theme.syntax.color("function"),
},
]),
],

2
crates/ui2/src/components/buffer.rs
View file

@ -166,7 +166,7 @@ impl Buffer {
let line_number_color = if row.current {
theme.text
} else {
theme.syntax.comment
theme.syntax.get("comment").color.unwrap_or_default()
};
h_stack()

8
crates/ui2/src/components/toolbar.rs
View file

@ -101,21 +101,21 @@ mod stories {
Symbol(vec![
HighlightedText {
text: "impl ".to_string(),
color: theme.syntax.keyword,
color: theme.syntax.color("keyword"),
},
HighlightedText {
text: "ToolbarStory".to_string(),
color: theme.syntax.function,
color: theme.syntax.color("function"),
},
]),
Symbol(vec![
HighlightedText {
text: "fn ".to_string(),
color: theme.syntax.keyword,
color: theme.syntax.color("keyword"),
},
HighlightedText {
text: "render".to_string(),
color: theme.syntax.function,
color: theme.syntax.color("function"),
},
]),
],

40
crates/ui2/src/static_data.rs
View file

@ -652,11 +652,11 @@ pub fn hello_world_rust_editor_example(cx: &mut WindowContext) -> EditorPane {
vec![Symbol(vec![
HighlightedText {
text: "fn ".to_string(),
color: theme.syntax.keyword,
color: theme.syntax.color("keyword"),
},
HighlightedText {
text: "main".to_string(),
color: theme.syntax.function,
color: theme.syntax.color("function"),
},
])],
hello_world_rust_buffer_example(&theme),
@ -686,11 +686,11 @@ pub fn hello_world_rust_buffer_rows(theme: &Theme) -> Vec<BufferRow> {
highlighted_texts: vec![
HighlightedText {
text: "fn ".to_string(),
color: theme.syntax.keyword,
color: theme.syntax.color("keyword"),
},
HighlightedText {
text: "main".to_string(),
color: theme.syntax.function,
color: theme.syntax.color("function"),
},
HighlightedText {
text: "() {".to_string(),
@ -710,7 +710,7 @@ pub fn hello_world_rust_buffer_rows(theme: &Theme) -> Vec<BufferRow> {
highlighted_texts: vec![HighlightedText {
text: " // Statements here are executed when the compiled binary is called."
.to_string(),
color: theme.syntax.comment,
color: theme.syntax.color("comment"),
}],
}),
cursors: None,
@ -733,7 +733,7 @@ pub fn hello_world_rust_buffer_rows(theme: &Theme) -> Vec<BufferRow> {
line: Some(HighlightedLine {
highlighted_texts: vec![HighlightedText {
text: " // Print text to the console.".to_string(),
color: theme.syntax.comment,
color: theme.syntax.color("comment"),
}],
}),
cursors: None,
@ -752,7 +752,7 @@ pub fn hello_world_rust_buffer_rows(theme: &Theme) -> Vec<BufferRow> {
},
HighlightedText {
text: "\"Hello, world!\"".to_string(),
color: theme.syntax.string,
color: theme.syntax.color("string"),
},
HighlightedText {
text: ");".to_string(),
@ -791,11 +791,11 @@ pub fn hello_world_rust_editor_with_status_example(cx: &mut WindowContext) -> Ed
vec![Symbol(vec![
HighlightedText {
text: "fn ".to_string(),
color: theme.syntax.keyword,
color: theme.syntax.color("keyword"),
},
HighlightedText {
text: "main".to_string(),
color: theme.syntax.function,
color: theme.syntax.color("function"),
},
])],
hello_world_rust_buffer_with_status_example(&theme),
@ -825,11 +825,11 @@ pub fn hello_world_rust_with_status_buffer_rows(theme: &Theme) -> Vec<BufferRow>
highlighted_texts: vec![
HighlightedText {
text: "fn ".to_string(),
color: theme.syntax.keyword,
color: theme.syntax.color("keyword"),
},
HighlightedText {
text: "main".to_string(),
color: theme.syntax.function,
color: theme.syntax.color("function"),
},
HighlightedText {
text: "() {".to_string(),
@ -849,7 +849,7 @@ pub fn hello_world_rust_with_status_buffer_rows(theme: &Theme) -> Vec<BufferRow>
highlighted_texts: vec![HighlightedText {
text: "// Statements here are executed when the compiled binary is called."
.to_string(),
color: theme.syntax.comment,
color: theme.syntax.color("comment"),
}],
}),
cursors: None,
@ -872,7 +872,7 @@ pub fn hello_world_rust_with_status_buffer_rows(theme: &Theme) -> Vec<BufferRow>
line: Some(HighlightedLine {
highlighted_texts: vec![HighlightedText {
text: " // Print text to the console.".to_string(),
color: theme.syntax.comment,
color: theme.syntax.color("comment"),
}],
}),
cursors: None,
@ -891,7 +891,7 @@ pub fn hello_world_rust_with_status_buffer_rows(theme: &Theme) -> Vec<BufferRow>
},
HighlightedText {
text: "\"Hello, world!\"".to_string(),
color: theme.syntax.string,
color: theme.syntax.color("string"),
},
HighlightedText {
text: ");".to_string(),
@ -938,7 +938,7 @@ pub fn hello_world_rust_with_status_buffer_rows(theme: &Theme) -> Vec<BufferRow>
line: Some(HighlightedLine {
highlighted_texts: vec![HighlightedText {
text: "// Marshall and Nate were here".to_string(),
color: theme.syntax.comment,
color: theme.syntax.color("comment"),
}],
}),
cursors: None,
@ -969,7 +969,7 @@ pub fn terminal_buffer_rows(theme: &Theme) -> Vec<BufferRow> {
highlighted_texts: vec![
HighlightedText {
text: "maxdeviant ".to_string(),
color: theme.syntax.keyword,
color: theme.syntax.color("keyword"),
},
HighlightedText {
text: "in ".to_string(),
@ -977,7 +977,7 @@ pub fn terminal_buffer_rows(theme: &Theme) -> Vec<BufferRow> {
},
HighlightedText {
text: "profaned-capital ".to_string(),
color: theme.syntax.function,
color: theme.syntax.color("function"),
},
HighlightedText {
text: "in ".to_string(),
@ -985,7 +985,7 @@ pub fn terminal_buffer_rows(theme: &Theme) -> Vec<BufferRow> {
},
HighlightedText {
text: "~/p/zed ".to_string(),
color: theme.syntax.function,
color: theme.syntax.color("function"),
},
HighlightedText {
text: "on ".to_string(),
@ -993,7 +993,7 @@ pub fn terminal_buffer_rows(theme: &Theme) -> Vec<BufferRow> {
},
HighlightedText {
text: " gpui2-ui ".to_string(),
color: theme.syntax.keyword,
color: theme.syntax.color("keyword"),
},
],
}),
@ -1008,7 +1008,7 @@ pub fn terminal_buffer_rows(theme: &Theme) -> Vec<BufferRow> {
line: Some(HighlightedLine {
highlighted_texts: vec![HighlightedText {
text: "λ ".to_string(),
color: theme.syntax.string,
color: theme.syntax.color("string"),
}],
}),
cursors: None,