@@ -1,11 +1,10 @@
use std::sync::Arc;
-use gpui::{hsla, rgba};
+use gpui::{hsla, FontStyle, FontWeight, HighlightStyle};
use crate::{
- black, blue, cyan, default_color_scales, green, neutral, red, violet, yellow, Appearance,
- PlayerColors, StatusColors, SyntaxTheme, SystemColors, Theme, ThemeColors, ThemeFamily,
- ThemeStyles,
+ default_color_scales, Appearance, PlayerColors, StatusColors, SyntaxTheme, SystemColors, Theme,
+ ThemeColors, ThemeFamily, ThemeStyles,
};
pub fn one_family() -> ThemeFamily {
@@ -19,11 +18,17 @@ pub fn one_family() -> ThemeFamily {
}
pub(crate) fn one_dark() -> Theme {
- // let bg = rgba(0x22252A).into();
- // let editor = rgba(0x292C33).into();
+ let bg = hsla(215. / 360., 12. / 100., 15. / 100., 1.);
+ let editor = hsla(220. / 360., 12. / 100., 18. / 100., 1.);
- let bg = hsla(218. / 360., 11. / 100., 15. / 100., 1.);
- let editor = hsla(222. / 360., 11. / 100., 18. / 100., 1.);
+ let blue = hsla(207.8 / 360., 81. / 100., 66. / 100., 1.0);
+ let gray = hsla(218.8 / 360., 10. / 100., 40. / 100., 1.0);
+ let green = hsla(95. / 360., 38. / 100., 62. / 100., 1.0);
+ let orange = hsla(29. / 360., 54. / 100., 61. / 100., 1.0);
+ let purple = hsla(286. / 360., 51. / 100., 64. / 100., 1.0);
+ let red = hsla(355. / 360., 65. / 100., 65. / 100., 1.0);
+ let teal = hsla(187. / 360., 47. / 100., 55. / 100., 1.0);
+ let yellow = hsla(39. / 360., 67. / 100., 69. / 100., 1.0);
Theme {
id: "one_dark".to_string(),
@@ -61,7 +66,7 @@ pub(crate) fn one_dark() -> Theme {
icon_muted: hsla(220.0 / 360., 12.1 / 100., 66.1 / 100., 1.0),
icon_disabled: hsla(220.0 / 360., 6.4 / 100., 45.7 / 100., 1.0),
icon_placeholder: hsla(220.0 / 360., 6.4 / 100., 45.7 / 100., 1.0),
- icon_accent: hsla(222.6 / 360., 77.5 / 100., 65.1 / 100., 1.0),
+ icon_accent: blue.into(),
status_bar_background: bg,
title_bar_background: bg,
toolbar_background: editor,
@@ -72,36 +77,121 @@ pub(crate) fn one_dark() -> Theme {
editor_gutter_background: editor,
editor_subheader_background: bg,
editor_active_line_background: hsla(222.9 / 360., 13.5 / 100., 20.4 / 100., 1.0),
- editor_highlighted_line_background: gpui::red(),
+ editor_highlighted_line_background: hsla(207.8 / 360., 81. / 100., 66. / 100., 0.1),
editor_line_number: hsla(222.0 / 360., 11.5 / 100., 34.1 / 100., 1.0),
editor_active_line_number: hsla(216.0 / 360., 5.9 / 100., 49.6 / 100., 1.0),
editor_invisible: hsla(222.0 / 360., 11.5 / 100., 34.1 / 100., 1.0),
- editor_wrap_guide: gpui::red(),
+ editor_wrap_guide: gpui::black(),
editor_active_wrap_guide: gpui::red(),
- editor_document_highlight_read_background: gpui::red(),
+ editor_document_highlight_read_background: hsla(
+ 207.8 / 360.,
+ 81. / 100.,
+ 66. / 100.,
+ 0.2,
+ ),
editor_document_highlight_write_background: gpui::red(),
terminal_background: bg,
// todo!("Use one colors for terminal")
- terminal_ansi_black: black().dark().step_12(),
- terminal_ansi_red: red().dark().step_11(),
- terminal_ansi_green: green().dark().step_11(),
- terminal_ansi_yellow: yellow().dark().step_11(),
- terminal_ansi_blue: blue().dark().step_11(),
- terminal_ansi_magenta: violet().dark().step_11(),
- terminal_ansi_cyan: cyan().dark().step_11(),
- terminal_ansi_white: neutral().dark().step_12(),
- terminal_ansi_bright_black: black().dark().step_11(),
- terminal_ansi_bright_red: red().dark().step_10(),
- terminal_ansi_bright_green: green().dark().step_10(),
- terminal_ansi_bright_yellow: yellow().dark().step_10(),
- terminal_ansi_bright_blue: blue().dark().step_10(),
- terminal_ansi_bright_magenta: violet().dark().step_10(),
- terminal_ansi_bright_cyan: cyan().dark().step_10(),
- terminal_ansi_bright_white: neutral().dark().step_11(),
+ terminal_ansi_black: crate::black().dark().step_12(),
+ terminal_ansi_red: crate::red().dark().step_11(),
+ terminal_ansi_green: crate::green().dark().step_11(),
+ terminal_ansi_yellow: crate::yellow().dark().step_11(),
+ terminal_ansi_blue: crate::blue().dark().step_11(),
+ terminal_ansi_magenta: crate::violet().dark().step_11(),
+ terminal_ansi_cyan: crate::cyan().dark().step_11(),
+ terminal_ansi_white: crate::neutral().dark().step_12(),
+ terminal_ansi_bright_black: crate::black().dark().step_11(),
+ terminal_ansi_bright_red: crate::red().dark().step_10(),
+ terminal_ansi_bright_green: crate::green().dark().step_10(),
+ terminal_ansi_bright_yellow: crate::yellow().dark().step_10(),
+ terminal_ansi_bright_blue: crate::blue().dark().step_10(),
+ terminal_ansi_bright_magenta: crate::violet().dark().step_10(),
+ terminal_ansi_bright_cyan: crate::cyan().dark().step_10(),
+ terminal_ansi_bright_white: crate::neutral().dark().step_11(),
+ },
+ status: StatusColors {
+ conflict: yellow,
+ created: green,
+ deleted: red,
+ error: red,
+ hidden: gray,
+ hint: blue,
+ ignored: gray,
+ info: blue,
+ modified: yellow,
+ predictive: gray,
+ renamed: blue,
+ success: green,
+ unreachable: gray,
+ warning: yellow,
},
- status: StatusColors::dark(),
player: PlayerColors::dark(),
- syntax: Arc::new(SyntaxTheme::dark()),
+ syntax: Arc::new(SyntaxTheme {
+ highlights: vec![
+ ("attribute".into(), purple.into()),
+ ("boolean".into(), orange.into()),
+ ("comment".into(), gray.into()),
+ ("comment.doc".into(), gray.into()),
+ ("constant".into(), yellow.into()),
+ ("constructor".into(), blue.into()),
+ ("embedded".into(), HighlightStyle::default()),
+ (
+ "emphasis".into(),
+ HighlightStyle {
+ font_style: Some(FontStyle::Italic),
+ ..HighlightStyle::default()
+ },
+ ),
+ (
+ "emphasis.strong".into(),
+ HighlightStyle {
+ font_weight: Some(FontWeight::BOLD),
+ ..HighlightStyle::default()
+ },
+ ),
+ ("enum".into(), HighlightStyle::default()),
+ ("function".into(), blue.into()),
+ ("function.method".into(), blue.into()),
+ ("function.definition".into(), blue.into()),
+ ("hint".into(), blue.into()),
+ ("keyword".into(), purple.into()),
+ ("label".into(), HighlightStyle::default()),
+ ("link_text".into(), blue.into()),
+ (
+ "link_uri".into(),
+ HighlightStyle {
+ color: Some(teal.into()),
+ font_style: Some(FontStyle::Italic),
+ ..HighlightStyle::default()
+ },
+ ),
+ ("number".into(), orange.into()),
+ ("operator".into(), HighlightStyle::default()),
+ ("predictive".into(), HighlightStyle::default()),
+ ("preproc".into(), HighlightStyle::default()),
+ ("primary".into(), HighlightStyle::default()),
+ ("property".into(), red.into()),
+ ("punctuation".into(), HighlightStyle::default()),
+ ("punctuation.bracket".into(), HighlightStyle::default()),
+ ("punctuation.delimiter".into(), HighlightStyle::default()),
+ ("punctuation.list_marker".into(), HighlightStyle::default()),
+ ("punctuation.special".into(), HighlightStyle::default()),
+ ("string".into(), green.into()),
+ ("string.escape".into(), HighlightStyle::default()),
+ ("string.regex".into(), red.into()),
+ ("string.special".into(), HighlightStyle::default()),
+ ("string.special.symbol".into(), HighlightStyle::default()),
+ ("tag".into(), HighlightStyle::default()),
+ ("text.literal".into(), HighlightStyle::default()),
+ ("title".into(), HighlightStyle::default()),
+ ("type".into(), teal.into()),
+ ("variable".into(), HighlightStyle::default()),
+ ("variable.special".into(), red.into()),
+ ("variant".into(), HighlightStyle::default()),
+ ],
+ inlay_style: HighlightStyle::default(),
+ suggestion_style: HighlightStyle::default(),
+ }),
},
}
}