From 259678585c3410044683bf4d2619b2d024a04514 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Wed, 1 Dec 2021 13:08:20 +0900
Subject: ui: Optimize tree-sitter style lookups

Tree sitter returns an index referring to the position of the scope in
the scopes array. We can use that same index to avoid a hashmap lookup
and instead store the styles in an array.

This currently stores the styles in both a map and an array because the
UI still uses hashmap lookups, but it's a reasonable tradeoff.
---
 helix-view/src/theme.rs | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'helix-view/src/theme.rs')

diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 757316bd..2366ff7d 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -78,8 +78,11 @@ impl Loader {
 
 #[derive(Clone, Debug)]
 pub struct Theme {
-    scopes: Vec<String>,
+    // UI styles are stored in a HashMap
     styles: HashMap<String, Style>,
+    // tree-sitter highlight styles are stored in a Vec to optimize lookups
+    scopes: Vec<String>,
+    highlights: Vec<Style>,
 }
 
 impl<'de> Deserialize<'de> for Theme {
@@ -88,6 +91,8 @@ impl<'de> Deserialize<'de> for Theme {
         D: Deserializer<'de>,
     {
         let mut styles = HashMap::new();
+        let mut scopes = Vec::new();
+        let mut highlights = Vec::new();
 
         if let Ok(mut colors) = HashMap::<String, Value>::deserialize(deserializer) {
             // TODO: alert user of parsing failures in editor
@@ -102,21 +107,35 @@ impl<'de> Deserialize<'de> for Theme {
                 .unwrap_or_default();
 
             styles.reserve(colors.len());
+            scopes.reserve(colors.len());
+            highlights.reserve(colors.len());
+
             for (name, style_value) in colors {
                 let mut style = Style::default();
                 if let Err(err) = palette.parse_style(&mut style, style_value) {
                     warn!("{}", err);
                 }
-                styles.insert(name, style);
+
+                // these are used both as UI and as highlights
+                styles.insert(name.clone(), style);
+                scopes.push(name);
+                highlights.push(style);
             }
         }
 
-        let scopes = styles.keys().map(ToString::to_string).collect();
-        Ok(Self { scopes, styles })
+        Ok(Self {
+            scopes,
+            styles,
+            highlights,
+        })
     }
 }
 
 impl Theme {
+    pub fn highlight(&self, index: usize) -> Style {
+        self.highlights[index]
+    }
+
     pub fn get(&self, scope: &str) -> Style {
         self.try_get(scope)
             .unwrap_or_else(|| Style::default().fg(Color::Rgb(0, 0, 255)))
-- 
cgit v1.2.3-70-g09d2


From 662ecf0cd439bc850eee37717ecb49eebf497a24 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Wed, 1 Dec 2021 13:13:50 +0900
Subject: Annotate Theme::highlight with #[inline]

---
 helix-view/src/theme.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'helix-view/src/theme.rs')

diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 2366ff7d..47fc6262 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -132,6 +132,7 @@ impl<'de> Deserialize<'de> for Theme {
 }
 
 impl Theme {
+    #[inline]
     pub fn highlight(&self, index: usize) -> Style {
         self.highlights[index]
     }
-- 
cgit v1.2.3-70-g09d2


From 98ce2a301da25152563137047377026d72fd644c Mon Sep 17 00:00:00 2001
From: Omnikar
Date: Sun, 14 Nov 2021 07:26:48 -0500
Subject: Load alt default theme if true color is not supported

* Move `runtime/themes/base16_default_terminal.toml` to
  `base16_theme.toml` alongside `theme.toml`
* Use `terminfo` crate to detect whether the terminal supports true
  color and, if the user has no theme configured and their terminal does
  not support true color, load the alt default theme instead of the
  normal default.

Remove `terminfo` dependency, use `COLORTERM` env instead

Prevent user from switching to an unsupported theme

Add `true-color-override` option

If the terminal is wrongly detected to not support true color,
`true-color-override = true` will override the detection.

Rename `true-color-override` to `true-color`
---
 base16_theme.toml                   | 41 +++++++++++++++++++++++++++++++++++++
 book/src/configuration.md           |  1 +
 helix-term/src/application.rs       | 28 +++++++++++++++++--------
 helix-term/src/commands.rs          | 14 +++++++++++--
 helix-term/src/lib.rs               |  6 ++++++
 helix-term/src/ui/mod.rs            |  1 +
 helix-view/src/editor.rs            | 12 +++--------
 helix-view/src/theme.rs             | 20 ++++++++++++++++++
 runtime/themes/base16_terminal.toml | 41 -------------------------------------
 9 files changed, 103 insertions(+), 61 deletions(-)
 create mode 100644 base16_theme.toml
 delete mode 100644 runtime/themes/base16_terminal.toml

(limited to 'helix-view/src/theme.rs')

diff --git a/base16_theme.toml b/base16_theme.toml
new file mode 100644
index 00000000..bf3c73f1
--- /dev/null
+++ b/base16_theme.toml
@@ -0,0 +1,41 @@
+# Author: NNB <nnbnh@protonmail.com>
+
+"ui.menu" = "black"
+"ui.menu.selected" = { fg = "white", bg = "black" }
+"ui.linenr" = { fg = "light-gray", bg = "black" }
+"ui.popup" = { bg = "black" }
+"ui.window" = { bg = "black" }
+"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
+"ui.selection" = { fg = "gray", modifiers = ["reversed"] }
+"comment" = { fg = "light-gray", modifiers = ["italic"] }
+"ui.statusline" = { fg = "white", bg = "black" }
+"ui.help" = { fg = "white", bg = "black" }
+"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] } #FIXME
+"ui.text" = "white" #FIXME
+"operator" = "white" #FIXME
+"ui.text.focus" = "white" #FIXME
+"variable" = "light-red"
+"constant.numeric" = "yellow"
+"constant" = "yellow"
+"attributes" = "yellow"
+"type" = "light-yellow"
+"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
+"string"  = "light-green"
+"variable.other.member" = "light-green"
+"constant.character.escape" = "light-cyan"
+"function" = "light-blue"
+"constructor" = "light-blue"
+"special" = "light-blue"
+"keyword" = "light-magenta"
+"label" = "light-magenta"
+"namespace" = "light-magenta"
+"ui.popup" = { bg = "black" }
+"ui.window" = { bg = "base00" }
+"ui.help" = { fg = "white", bg = "black" }
+
+"info" = "light-gray"
+"hint" = "light-gray"
+"debug" = "light-gray"
+"diagnostic" = "light-gray"
+"error" = "light-magenta"
diff --git a/book/src/configuration.md b/book/src/configuration.md
index 2ed48d51..33a933b2 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -23,6 +23,7 @@ To override global configuration parameters, create a `config.toml` file located
 | `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant. | `400` |
 | `completion-trigger-len` | The min-length of word under cursor to trigger autocompletion | `2` |
 | `auto-info` | Whether to display infoboxes | `true` |
+| `true-color` | Set to `true` to override automatic detection of terminal truecolor support in the event of a false negative. | `false` |
 
 `[editor.filepicker]` section of the config. Sets options for file picker and global search. All but the last key listed in the default file-picker configuration below are IgnoreOptions: whether hidden files and files listed within ignore files are ignored by (not visible in) the helix file picker and global search. There is also one other key, `max-depth` available, which is not defined by default.
 
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 90330751..3e0b6d59 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -76,17 +76,27 @@ impl Application {
             None => Ok(def_lang_conf),
         };
 
-        let theme = if let Some(theme) = &config.theme {
-            match theme_loader.load(theme) {
-                Ok(theme) => theme,
-                Err(e) => {
-                    log::warn!("failed to load theme `{}` - {}", theme, e);
+        let true_color = config.editor.true_color || crate::true_color();
+        let theme = config
+            .theme
+            .as_ref()
+            .and_then(|theme| {
+                theme_loader
+                    .load(theme)
+                    .map_err(|e| {
+                        log::warn!("failed to load theme `{}` - {}", theme, e);
+                        e
+                    })
+                    .ok()
+                    .filter(|theme| (true_color || theme.is_16_color()))
+            })
+            .unwrap_or_else(|| {
+                if true_color {
                     theme_loader.default()
+                } else {
+                    theme_loader.base16_default()
                 }
-            }
-        } else {
-            theme_loader.default()
-        };
+            });
 
         let syn_loader_conf: helix_core::syntax::Configuration = lang_conf
             .and_then(|conf| conf.try_into())
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 0ae225e9..22c23043 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2366,8 +2366,18 @@ pub mod cmd {
         args: &[Cow<str>],
         _event: PromptEvent,
     ) -> anyhow::Result<()> {
-        let theme = args.first().context("theme not provided")?;
-        cx.editor.set_theme_from_name(theme)
+        let theme = args.first().context("Theme not provided")?;
+        let theme = cx
+            .editor
+            .theme_loader
+            .load(theme)
+            .with_context(|| format!("Failed setting theme {}", theme))?;
+        let true_color = cx.editor.config.true_color || crate::true_color();
+        if !(true_color || theme.is_16_color()) {
+            bail!("Unsupported theme: theme requires true color support");
+        }
+        cx.editor.set_theme(theme);
+        Ok(())
     }
 
     fn yank_main_selection_to_clipboard(
diff --git a/helix-term/src/lib.rs b/helix-term/src/lib.rs
index f5e3a8cd..4fe76cd5 100644
--- a/helix-term/src/lib.rs
+++ b/helix-term/src/lib.rs
@@ -9,3 +9,9 @@ pub mod config;
 pub mod job;
 pub mod keymap;
 pub mod ui;
+
+fn true_color() -> bool {
+    std::env::var("COLORTERM")
+        .map(|v| matches!(v.as_str(), "truecolor" | "24bit"))
+        .unwrap_or(false)
+}
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index cdf42311..f57e2e2b 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -186,6 +186,7 @@ pub mod completers {
             &helix_core::config_dir().join("themes"),
         ));
         names.push("default".into());
+        names.push("base16_default".into());
 
         let mut names: Vec<_> = names
             .into_iter()
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index dcbcbe4f..753defa1 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -105,6 +105,8 @@ pub struct Config {
     /// Whether to display infoboxes. Defaults to true.
     pub auto_info: bool,
     pub file_picker: FilePickerConfig,
+    /// Set to `true` to override automatic detection of terminal truecolor support in the event of a false negative. Defaults to `false`.
+    pub true_color: bool,
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Deserialize)]
@@ -137,6 +139,7 @@ impl Default for Config {
             completion_trigger_len: 2,
             auto_info: true,
             file_picker: FilePickerConfig::default(),
+            true_color: false,
         }
     }
 }
@@ -265,15 +268,6 @@ impl Editor {
         self._refresh();
     }
 
-    pub fn set_theme_from_name(&mut self, theme: &str) -> anyhow::Result<()> {
-        let theme = self
-            .theme_loader
-            .load(theme.as_ref())
-            .with_context(|| format!("failed setting theme `{}`", theme))?;
-        self.set_theme(theme);
-        Ok(())
-    }
-
     /// Refreshes the language server for a given document
     pub fn refresh_language_server(&mut self, doc_id: DocumentId) -> Option<()> {
         let doc = self.documents.get_mut(&doc_id)?;
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 47fc6262..ddcdad99 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -15,6 +15,10 @@ pub use crate::graphics::{Color, Modifier, Style};
 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_theme.toml"))
+        .expect("Failed to parse base 16 default theme")
+});
 
 #[derive(Clone, Debug)]
 pub struct Loader {
@@ -35,6 +39,9 @@ impl Loader {
         if name == "default" {
             return Ok(self.default());
         }
+        if name == "base16_default" {
+            return Ok(self.base16_default());
+        }
         let filename = format!("{}.toml", name);
 
         let user_path = self.user_dir.join(&filename);
@@ -74,6 +81,11 @@ impl Loader {
     pub fn default(&self) -> Theme {
         DEFAULT_THEME.clone()
     }
+
+    /// Returns the alternative 16-color default theme
+    pub fn base16_default(&self) -> Theme {
+        BASE16_DEFAULT_THEME.clone()
+    }
 }
 
 #[derive(Clone, Debug)]
@@ -154,6 +166,14 @@ impl Theme {
     pub fn find_scope_index(&self, scope: &str) -> Option<usize> {
         self.scopes().iter().position(|s| s == scope)
     }
+
+    pub fn is_16_color(&self) -> bool {
+        self.styles.iter().all(|(_, style)| {
+            [style.fg, style.bg]
+                .into_iter()
+                .all(|color| !matches!(color, Some(Color::Rgb(..))))
+        })
+    }
 }
 
 struct ThemePalette {
diff --git a/runtime/themes/base16_terminal.toml b/runtime/themes/base16_terminal.toml
deleted file mode 100644
index bf3c73f1..00000000
--- a/runtime/themes/base16_terminal.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-# Author: NNB <nnbnh@protonmail.com>
-
-"ui.menu" = "black"
-"ui.menu.selected" = { fg = "white", bg = "black" }
-"ui.linenr" = { fg = "light-gray", bg = "black" }
-"ui.popup" = { bg = "black" }
-"ui.window" = { bg = "black" }
-"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
-"ui.selection" = { fg = "gray", modifiers = ["reversed"] }
-"comment" = { fg = "light-gray", modifiers = ["italic"] }
-"ui.statusline" = { fg = "white", bg = "black" }
-"ui.help" = { fg = "white", bg = "black" }
-"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
-"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] } #FIXME
-"ui.text" = "white" #FIXME
-"operator" = "white" #FIXME
-"ui.text.focus" = "white" #FIXME
-"variable" = "light-red"
-"constant.numeric" = "yellow"
-"constant" = "yellow"
-"attributes" = "yellow"
-"type" = "light-yellow"
-"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
-"string"  = "light-green"
-"variable.other.member" = "light-green"
-"constant.character.escape" = "light-cyan"
-"function" = "light-blue"
-"constructor" = "light-blue"
-"special" = "light-blue"
-"keyword" = "light-magenta"
-"label" = "light-magenta"
-"namespace" = "light-magenta"
-"ui.popup" = { bg = "black" }
-"ui.window" = { bg = "base00" }
-"ui.help" = { fg = "white", bg = "black" }
-
-"info" = "light-gray"
-"hint" = "light-gray"
-"debug" = "light-gray"
-"diagnostic" = "light-gray"
-"error" = "light-magenta"
-- 
cgit v1.2.3-70-g09d2


From a9a9d498e87a91d9c069946cffd0480c4c3b50c6 Mon Sep 17 00:00:00 2001
From: NNB
Date: Thu, 2 Dec 2021 20:03:02 +0700
Subject: Update theme.rs

---
 helix-view/src/theme.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'helix-view/src/theme.rs')

diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index ddcdad99..a5dc0609 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_theme.toml"))
+    toml::from_slice(include_bytes!("../../base16_tty.toml"))
         .expect("Failed to parse base 16 default theme")
 });
 
-- 
cgit v1.2.3-70-g09d2


From d9727868dd7a496d33a321faeacfcd02d8c1c06e Mon Sep 17 00:00:00 2001
From: NNB
Date: Thu, 2 Dec 2021 19:33:31 +0700
Subject: change to .unwrap_or_default() and fix ui.window and ui.statusline

---
 base16_terminal.toml                     | 10 +++-------
 helix-view/src/theme.rs                  |  2 +-
 runtime/themes/base16_default_dark.toml  |  4 +---
 runtime/themes/base16_default_light.toml |  4 +---
 runtime/themes/base16_tty.toml           | 17 ++++++-----------
 5 files changed, 12 insertions(+), 25 deletions(-)

(limited to 'helix-view/src/theme.rs')

diff --git a/base16_terminal.toml b/base16_terminal.toml
index e613526f..a76cfd7e 100644
--- a/base16_terminal.toml
+++ b/base16_terminal.toml
@@ -1,7 +1,7 @@
 # Author: NNB <nnbnh@protonmail.com>
 
 "ui.menu" = "black"
-"ui.menu.selected" = { fg = "white", bg = "black" }
+"ui.menu.selected" = { modifiers = ["reversed"] }
 "ui.linenr" = { fg = "light-gray", bg = "black" }
 "ui.popup" = { bg = "black" }
 "ui.window" = { bg = "black" }
@@ -9,12 +9,10 @@
 "ui.selection" = { fg = "gray", modifiers = ["reversed"] }
 "comment" = { fg = "light-gray", modifiers = ["italic"] }
 "ui.statusline" = { fg = "white", bg = "black" }
+"ui.statusline.inactive" = { fg = "gray", bg = "black" }
 "ui.help" = { fg = "white", bg = "black" }
 "ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
-"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] } #FIXME
-"ui.text" = "white" #FIXME
-"operator" = "white" #FIXME
-"ui.text.focus" = "white" #FIXME
+"ui.cursor.primary" = { modifiers = ["reversed"] }
 "variable" = "light-red"
 "constant.numeric" = "yellow"
 "constant" = "yellow"
@@ -30,8 +28,6 @@
 "keyword" = "light-magenta"
 "label" = "light-magenta"
 "namespace" = "light-magenta"
-"ui.popup" = { bg = "black" }
-"ui.window" = { bg = "base00" }
 "ui.help" = { fg = "white", bg = "black" }
 
 "info" = "light-gray"
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index a5dc0609..6ca021a9 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -151,7 +151,7 @@ impl Theme {
 
     pub fn get(&self, scope: &str) -> Style {
         self.try_get(scope)
-            .unwrap_or_else(|| Style::default().fg(Color::Rgb(0, 0, 255)))
+            .unwrap_or_default()
     }
 
     pub fn try_get(&self, scope: &str) -> Option<Style> {
diff --git a/runtime/themes/base16_default_dark.toml b/runtime/themes/base16_default_dark.toml
index 3472162b..0b12bdbc 100644
--- a/runtime/themes/base16_default_dark.toml
+++ b/runtime/themes/base16_default_dark.toml
@@ -2,7 +2,7 @@
 
 "ui.background" = { bg = "base00" }
 "ui.menu" = "base01"
-"ui.menu.selected" = { fg = "base04", bg = "base01" }
+"ui.menu.selected" = { fg = "base01", bg = "base04" }
 "ui.linenr" = { fg = "base03", bg = "base01" }
 "ui.popup" = { bg = "base01" }
 "ui.window" = { bg = "base01" }
@@ -31,8 +31,6 @@
 "keyword" = "base0E"
 "label" = "base0E"
 "namespace" = "base0E"
-"ui.popup" = { bg = "base01" }
-"ui.window" = { bg = "base00" }
 "ui.help" = { fg = "base06", bg = "base01" }
 
 "info" = "base03"
diff --git a/runtime/themes/base16_default_light.toml b/runtime/themes/base16_default_light.toml
index d864fd5f..144144d1 100644
--- a/runtime/themes/base16_default_light.toml
+++ b/runtime/themes/base16_default_light.toml
@@ -2,7 +2,7 @@
 
 "ui.background" = { bg = "base00" }
 "ui.menu" = "base01"
-"ui.menu.selected" = { fg = "base04", bg = "base01" }
+"ui.menu.selected" = { fg = "base01", bg = "base04" }
 "ui.linenr" = { fg = "base03", bg = "base01" }
 "ui.popup" = { bg = "base01" }
 "ui.window" = { bg = "base01" }
@@ -31,8 +31,6 @@
 "keyword" = "base0E"
 "label" = "base0E"
 "namespace" = "base0E"
-"ui.popup" = { bg = "base01" }
-"ui.window" = { bg = "base00" }
 "ui.help" = { fg = "base06", bg = "base01" }
 
 "info" = "base03"
diff --git a/runtime/themes/base16_tty.toml b/runtime/themes/base16_tty.toml
index 480bcd9c..e1d1647b 100644
--- a/runtime/themes/base16_tty.toml
+++ b/runtime/themes/base16_tty.toml
@@ -1,20 +1,17 @@
 # Author: NNB <nnbnh@protonmail.com>
 
 "ui.menu" = "black"
-"ui.menu.selected" = { fg = "white", bg = "black" }
+"ui.menu.selected" = { modifiers = ["reversed"] }
 "ui.linenr" = { fg = "gray", bg = "black" }
-"ui.popup" = { bg = "black" }
-"ui.window" = { bg = "black" }
+"ui.popup" = { modifiers = ["reversed"] }
 "ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
 "ui.selection" = { fg = "black", bg = "blue" }
 "ui.selection.primary" = { fg = "white", bg = "blue" }
 "comment" = { fg = "gray" }
-"ui.statusline" = { fg = "white", bg = "black" }
-"ui.help" = { fg = "white", bg = "black" }
-"ui.cursor" = { fg = "white", modifiers = ["reversed"] } #FIXME
-"ui.text" = "white" #FIXME
-"operator" = "white" #FIXME
-"ui.text.focus" = "white" #FIXME
+"ui.statusline" = { fg = "black", bg = "white" }
+"ui.statusline.inactive" = { fg = "gray", bg = "white" }
+"ui.help" = { modifiers = ["reversed"] }
+"ui.cursor" = { modifiers = ["reversed"] }
 "variable" = "red"
 "constant.numeric" = "yellow"
 "constant" = "yellow"
@@ -30,8 +27,6 @@
 "keyword" = "magenta"
 "label" = "magenta"
 "namespace" = "magenta"
-"ui.popup" = { bg = "black" }
-"ui.window" = { bg = "base00" }
 "ui.help" = { fg = "white", bg = "black" }
 
 "info" = "gray"
-- 
cgit v1.2.3-70-g09d2


From 42e6d96a75c743c2fa8da6c8a0587487b3c21bf0 Mon Sep 17 00:00:00 2001
From: Omnikar
Date: Thu, 2 Dec 2021 22:34:54 -0500
Subject: Use `base16_tty` as 16-color default, fix theme name

---
 base16_terminal.toml                | 37 -------------------------------------
 base16_theme.toml                   | 36 ++++++++++++++++++++++++++++++++++++
 helix-view/src/theme.rs             |  5 ++---
 runtime/themes/base16_terminal.toml | 37 +++++++++++++++++++++++++++++++++++++
 runtime/themes/base16_tty.toml      | 36 ------------------------------------
 5 files changed, 75 insertions(+), 76 deletions(-)
 delete mode 100644 base16_terminal.toml
 create mode 100644 base16_theme.toml
 create mode 100644 runtime/themes/base16_terminal.toml
 delete mode 100644 runtime/themes/base16_tty.toml

(limited to 'helix-view/src/theme.rs')

diff --git a/base16_terminal.toml b/base16_terminal.toml
deleted file mode 100644
index a76cfd7e..00000000
--- a/base16_terminal.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-# Author: NNB <nnbnh@protonmail.com>
-
-"ui.menu" = "black"
-"ui.menu.selected" = { modifiers = ["reversed"] }
-"ui.linenr" = { fg = "light-gray", bg = "black" }
-"ui.popup" = { bg = "black" }
-"ui.window" = { bg = "black" }
-"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
-"ui.selection" = { fg = "gray", modifiers = ["reversed"] }
-"comment" = { fg = "light-gray", modifiers = ["italic"] }
-"ui.statusline" = { fg = "white", bg = "black" }
-"ui.statusline.inactive" = { fg = "gray", bg = "black" }
-"ui.help" = { fg = "white", bg = "black" }
-"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
-"ui.cursor.primary" = { modifiers = ["reversed"] }
-"variable" = "light-red"
-"constant.numeric" = "yellow"
-"constant" = "yellow"
-"attributes" = "yellow"
-"type" = "light-yellow"
-"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
-"string"  = "light-green"
-"variable.other.member" = "light-green"
-"constant.character.escape" = "light-cyan"
-"function" = "light-blue"
-"constructor" = "light-blue"
-"special" = "light-blue"
-"keyword" = "light-magenta"
-"label" = "light-magenta"
-"namespace" = "light-magenta"
-"ui.help" = { fg = "white", bg = "black" }
-
-"info" = "light-gray"
-"hint" = "light-gray"
-"debug" = "light-gray"
-"diagnostic" = "light-gray"
-"error" = "light-red"
diff --git a/base16_theme.toml b/base16_theme.toml
new file mode 100644
index 00000000..e1d1647b
--- /dev/null
+++ b/base16_theme.toml
@@ -0,0 +1,36 @@
+# Author: NNB <nnbnh@protonmail.com>
+
+"ui.menu" = "black"
+"ui.menu.selected" = { modifiers = ["reversed"] }
+"ui.linenr" = { fg = "gray", bg = "black" }
+"ui.popup" = { modifiers = ["reversed"] }
+"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
+"ui.selection" = { fg = "black", bg = "blue" }
+"ui.selection.primary" = { fg = "white", bg = "blue" }
+"comment" = { fg = "gray" }
+"ui.statusline" = { fg = "black", bg = "white" }
+"ui.statusline.inactive" = { fg = "gray", bg = "white" }
+"ui.help" = { modifiers = ["reversed"] }
+"ui.cursor" = { modifiers = ["reversed"] }
+"variable" = "red"
+"constant.numeric" = "yellow"
+"constant" = "yellow"
+"attributes" = "yellow"
+"type" = "yellow"
+"ui.cursor.match" = { fg = "yellow", modifiers = ["underlined"] }
+"string"  = "green"
+"variable.other.member" = "green"
+"constant.character.escape" = "cyan"
+"function" = "blue"
+"constructor" = "blue"
+"special" = "blue"
+"keyword" = "magenta"
+"label" = "magenta"
+"namespace" = "magenta"
+"ui.help" = { fg = "white", bg = "black" }
+
+"info" = "gray"
+"hint" = "gray"
+"debug" = "gray"
+"diagnostic" = "gray"
+"error" = "red"
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/runtime/themes/base16_terminal.toml b/runtime/themes/base16_terminal.toml
new file mode 100644
index 00000000..a76cfd7e
--- /dev/null
+++ b/runtime/themes/base16_terminal.toml
@@ -0,0 +1,37 @@
+# Author: NNB <nnbnh@protonmail.com>
+
+"ui.menu" = "black"
+"ui.menu.selected" = { modifiers = ["reversed"] }
+"ui.linenr" = { fg = "light-gray", bg = "black" }
+"ui.popup" = { bg = "black" }
+"ui.window" = { bg = "black" }
+"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
+"ui.selection" = { fg = "gray", modifiers = ["reversed"] }
+"comment" = { fg = "light-gray", modifiers = ["italic"] }
+"ui.statusline" = { fg = "white", bg = "black" }
+"ui.statusline.inactive" = { fg = "gray", bg = "black" }
+"ui.help" = { fg = "white", bg = "black" }
+"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
+"ui.cursor.primary" = { modifiers = ["reversed"] }
+"variable" = "light-red"
+"constant.numeric" = "yellow"
+"constant" = "yellow"
+"attributes" = "yellow"
+"type" = "light-yellow"
+"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
+"string"  = "light-green"
+"variable.other.member" = "light-green"
+"constant.character.escape" = "light-cyan"
+"function" = "light-blue"
+"constructor" = "light-blue"
+"special" = "light-blue"
+"keyword" = "light-magenta"
+"label" = "light-magenta"
+"namespace" = "light-magenta"
+"ui.help" = { fg = "white", bg = "black" }
+
+"info" = "light-gray"
+"hint" = "light-gray"
+"debug" = "light-gray"
+"diagnostic" = "light-gray"
+"error" = "light-red"
diff --git a/runtime/themes/base16_tty.toml b/runtime/themes/base16_tty.toml
deleted file mode 100644
index e1d1647b..00000000
--- a/runtime/themes/base16_tty.toml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Author: NNB <nnbnh@protonmail.com>
-
-"ui.menu" = "black"
-"ui.menu.selected" = { modifiers = ["reversed"] }
-"ui.linenr" = { fg = "gray", bg = "black" }
-"ui.popup" = { modifiers = ["reversed"] }
-"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
-"ui.selection" = { fg = "black", bg = "blue" }
-"ui.selection.primary" = { fg = "white", bg = "blue" }
-"comment" = { fg = "gray" }
-"ui.statusline" = { fg = "black", bg = "white" }
-"ui.statusline.inactive" = { fg = "gray", bg = "white" }
-"ui.help" = { modifiers = ["reversed"] }
-"ui.cursor" = { modifiers = ["reversed"] }
-"variable" = "red"
-"constant.numeric" = "yellow"
-"constant" = "yellow"
-"attributes" = "yellow"
-"type" = "yellow"
-"ui.cursor.match" = { fg = "yellow", modifiers = ["underlined"] }
-"string"  = "green"
-"variable.other.member" = "green"
-"constant.character.escape" = "cyan"
-"function" = "blue"
-"constructor" = "blue"
-"special" = "blue"
-"keyword" = "magenta"
-"label" = "magenta"
-"namespace" = "magenta"
-"ui.help" = { fg = "white", bg = "black" }
-
-"info" = "gray"
-"hint" = "gray"
-"debug" = "gray"
-"diagnostic" = "gray"
-"error" = "red"
-- 
cgit v1.2.3-70-g09d2