From 42e6d96a75c743c2fa8da6c8a0587487b3c21bf0 Mon Sep 17 00:00:00 2001
From: Omnikar <Omnikar5@gmail.com>
Date: Thu, 2 Dec 2021 22:34:54 -0500
Subject: [PATCH] Use `base16_tty` as 16-color default, fix theme name
---
runtime/themes/base16_tty.toml => base16_theme.toml | 0
helix-view/src/theme.rs | 5 ++---
base16_terminal.toml => runtime/themes/base16_terminal.toml | 0
3 files changed, 2 insertions(+), 3 deletions(-)
rename runtime/themes/base16_tty.toml => base16_theme.toml (100%)
rename base16_terminal.toml => runtime/themes/base16_terminal.toml (100%)
diff --git a/runtime/themes/base16_tty.toml b/base16_theme.toml
similarity index 100%
rename from runtime/themes/base16_tty.toml
rename to base16_theme.toml
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 6ca021a9..4a2ecbba 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -16,7 +16,7 @@ pub static DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
toml::from_slice(include_bytes!("../../theme.toml")).expect("Failed to parse default theme")
});
pub static BASE16_DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
- toml::from_slice(include_bytes!("../../base16_tty.toml"))
+ toml::from_slice(include_bytes!("../../base16_theme.toml"))
.expect("Failed to parse base 16 default theme")
});
@@ -150,8 +150,7 @@ impl Theme {
}
pub fn get(&self, scope: &str) -> Style {
- self.try_get(scope)
- .unwrap_or_default()
+ self.try_get(scope).unwrap_or_default()
}
pub fn try_get(&self, scope: &str) -> Option<Style> {
diff --git a/base16_terminal.toml b/runtime/themes/base16_terminal.toml
similarity index 100%
rename from base16_terminal.toml
rename to runtime/themes/base16_terminal.toml