Fallback to broader scope if theme scope not found (#1714)

helix-term/src/ui/markdown.rs

@@ -27,16 +27,15 @@ pub struct Markdown {
 // better yet, just use Tendril + subtendril for references
 
 impl Markdown {
-    // theme keys, including fallbacks
+    const TEXT_STYLE: &'static str = "ui.text";
-    const TEXT_STYLE: [&'static str; 2] = ["ui.text", "ui"];
+    const BLOCK_STYLE: &'static str = "markup.raw.inline";
-    const BLOCK_STYLE: [&'static str; 3] = ["markup.raw.inline", "markup.raw", "markup"];
+    const HEADING_STYLES: [&'static str; 6] = [
-    const HEADING_STYLES: [[&'static str; 3]; 6] = [
+        "markup.heading.1",
-        ["markup.heading.1", "markup.heading", "markup"],
+        "markup.heading.2",
-        ["markup.heading.2", "markup.heading", "markup"],
+        "markup.heading.3",
-        ["markup.heading.3", "markup.heading", "markup"],
+        "markup.heading.4",
-        ["markup.heading.4", "markup.heading", "markup"],
+        "markup.heading.5",
-        ["markup.heading.5", "markup.heading", "markup"],
+        "markup.heading.6",
-        ["markup.heading.6", "markup.heading", "markup"],
     ];
 
     pub fn new(contents: String, config_loader: Arc<syntax::Loader>) -> Self {
@@ -59,15 +58,9 @@ impl Markdown {
         let mut spans = Vec::new();
         let mut lines = Vec::new();
 
-        let get_theme = |keys: &[&str]| match theme {
+        let get_theme = |key: &str| -> Style { theme.map(|t| t.get(key)).unwrap_or_default() };
-            Some(theme) => keys
+        let text_style = get_theme(Self::TEXT_STYLE);
-                .iter()
+        let code_style = get_theme(Self::BLOCK_STYLE);
-                .find_map(|key| theme.try_get(key))
-                .unwrap_or_default(),
-            None => Default::default(),
-        };
-        let text_style = get_theme(&Self::TEXT_STYLE);
-        let code_style = get_theme(&Self::BLOCK_STYLE);
         let heading_styles: Vec<Style> = Self::HEADING_STYLES
             .iter()
             .map(|key| get_theme(key))

helix-view/src/theme.rs

@@ -153,8 +153,12 @@ impl Theme {
         self.try_get(scope).unwrap_or_default()
     }
 
+    /// Get the style of a scope, falling back to dot separated broader
+    /// scopes. For example if `ui.text.focus` is not defined in the theme,
+    /// `ui.text` is tried and then `ui` is tried.
     pub fn try_get(&self, scope: &str) -> Option<Style> {
-        self.styles.get(scope).copied()
+        std::iter::successors(Some(scope), |s| Some(s.rsplit_once('.')?.0))
+            .find_map(|s| self.styles.get(s).copied())
     }
 
     #[inline]