Maintain full functionality of the color_modes option

Author: patchunwrap

helix-term/src/commands.rs

@@ -2480,12 +2480,18 @@ fn global_search(cx: &mut Context) {
     let config = GlobalSearchConfig {
         smart_case: config.search.smart_case,
         file_picker_config: config.file_picker.clone(),
-        directory_style: cx.editor.theme.get(cx.editor.mode, "ui.text.directory"),
+        directory_style: cx
+            .editor
+            .theme
+            .get(cx.editor.theme_context(), "ui.text.directory"),
         number_style: cx
             .editor
             .theme
-            .get(cx.editor.mode, "constant.numeric.integer"),
-        colon_style: cx.editor.theme.get(cx.editor.mode, "punctuation"),
+            .get(cx.editor.theme_context(), "constant.numeric.integer"),
+        colon_style: cx
+            .editor
+            .theme
+            .get(cx.editor.theme_context(), "punctuation"),
     };
 
     let columns = [
@@ -3351,11 +3357,17 @@ fn changed_file_picker(cx: &mut Context) {
         return;
     }
 
-    let added = cx.editor.theme.get(cx.editor.mode, "diff.plus");
-    let modified = cx.editor.theme.get(cx.editor.mode, "diff.delta");
-    let conflict = cx.editor.theme.get(cx.editor.mode, "diff.delta.conflict");
-    let deleted = cx.editor.theme.get(cx.editor.mode, "diff.minus");
-    let renamed = cx.editor.theme.get(cx.editor.mode, "diff.delta.moved");
+    let added = cx.editor.theme.get(cx.editor.theme_context(), "diff.plus");
+    let modified = cx.editor.theme.get(cx.editor.theme_context(), "diff.delta");
+    let conflict = cx
+        .editor
+        .theme
+        .get(cx.editor.theme_context(), "diff.delta.conflict");
+    let deleted = cx.editor.theme.get(cx.editor.theme_context(), "diff.minus");
+    let renamed = cx
+        .editor
+        .theme
+        .get(cx.editor.theme_context(), "diff.delta.moved");
 
     let columns = [
         PickerColumn::new("change", |change: &FileChange, data: &FileChangeData| {

helix-term/src/commands/dap.rs

@@ -502,6 +502,10 @@ pub fn dap_next(cx: &mut Context) {
 }
 
 pub fn dap_variables(cx: &mut Context) {
+    // debugger takes cx.editor as a &mut borrow so this needs to be first
+    // to satisfy the borrow checker.
+    let theme_context = cx.editor.theme_context();
+
     let debugger = debugger!(cx.editor);
 
     if debugger.thread_id.is_none() {
@@ -549,9 +553,9 @@ pub fn dap_variables(cx: &mut Context) {
     let mut variables = Vec::new();
 
     let theme = &cx.editor.theme;
-    let scope_style = theme.get(cx.editor.mode, "ui.linenr.selected");
-    let type_style = theme.get(cx.editor.mode, "ui.text");
-    let text_style = theme.get(cx.editor.mode, "ui.text.focus");
+    let scope_style = theme.get(theme_context, "ui.linenr.selected");
+    let type_style = theme.get(theme_context, "ui.text");
+    let text_style = theme.get(theme_context, "ui.text.focus");
 
     for scope in scopes.iter() {
         // use helix_view::graphics::Style;

helix-term/src/commands/lsp.rs

@@ -239,10 +239,10 @@ fn diag_picker(
     });
 
     let styles = DiagnosticStyles {
-        hint: cx.editor.theme.get(cx.editor.mode, "hint"),
-        info: cx.editor.theme.get(cx.editor.mode, "info"),
-        warning: cx.editor.theme.get(cx.editor.mode, "warning"),
-        error: cx.editor.theme.get(cx.editor.mode, "error"),
+        hint: cx.editor.theme.get(cx.editor.theme_context(), "hint"),
+        info: cx.editor.theme.get(cx.editor.theme_context(), "info"),
+        warning: cx.editor.theme.get(cx.editor.theme_context(), "warning"),
+        error: cx.editor.theme.get(cx.editor.theme_context(), "error"),
     };
 
     let mut columns = vec![

helix-term/src/ui/completion.rs

@@ -133,7 +133,9 @@ impl Completion {
         let preview_completion_insert = editor.config().preview_completion_insert;
         let replace_mode = editor.config().completion_replace;
 
-        let dir_style = editor.theme.get(editor.mode, "ui.text.directory");
+        let dir_style = editor
+            .theme
+            .get(editor.theme_context(), "ui.text.directory");
 
         // Then create the menu
         let menu = Menu::new(items, dir_style, move |editor: &mut Editor, item, event| {
@@ -568,7 +570,7 @@ impl Component for Completion {
         };
 
         // clear area
-        let background = cx.editor.theme.get(cx.editor.mode, "ui.popup");
+        let background = cx.editor.theme.get(cx.editor.theme_context(), "ui.popup");
         surface.clear_with(doc_area, background);
 
         if cx.editor.popup_border() {

helix-term/src/ui/document.rs

@@ -245,7 +245,7 @@ impl<'a> TextRenderer<'a> {
             " ".to_owned()
         };
 
-        let text_style = theme.get(editor.mode, "ui.text");
+        let text_style = theme.get(editor.theme_context(), "ui.text");
 
         let indent_width = doc.indent_style.indent_width(tab_width) as u16;
 
@@ -258,15 +258,15 @@ impl<'a> TextRenderer<'a> {
             space,
             tab,
             virtual_tab,
-            whitespace_style: theme.get(editor.mode, "ui.virtual.whitespace"),
+            whitespace_style: theme.get(editor.theme_context(), "ui.virtual.whitespace"),
             indent_width,
             starting_indent: offset.col / indent_width as usize
                 + (offset.col % indent_width as usize != 0) as usize
                 + editor_config.indent_guides.skip_levels as usize,
             indent_guide_style: text_style.patch(
                 theme
-                    .try_get(editor.mode, "ui.virtual.indent-guide")
-                    .unwrap_or_else(|| theme.get(editor.mode, "ui.virtual.whitespace")),
+                    .try_get(editor.theme_context(), "ui.virtual.indent-guide")
+                    .unwrap_or_else(|| theme.get(editor.theme_context(), "ui.virtual.whitespace")),
             ),
             text_style,
             draw_indent_guides: editor_config.indent_guides.render,

helix-term/src/ui/editor.rs

@@ -113,7 +113,7 @@ impl EditorView {
         // Set DAP highlights, if needed.
         if let Some(frame) = editor.current_stack_frame() {
             let dap_line = frame.line.saturating_sub(1);
-            let style = theme.get(editor.mode, "ui.highlight.frameline");
+            let style = theme.get(editor.theme_context(), "ui.highlight.frameline");
             let line_decoration = move |renderer: &mut TextRenderer, pos: LinePos| {
                 if pos.doc_line != dap_line {
                     return;
@@ -200,7 +200,7 @@ impl EditorView {
         decorations.add_decoration(InlineDiagnostics::new(
             doc,
             theme,
-            editor.mode,
+            editor.theme_context(),
             primary_cursor,
             inline_diagnostic_config,
             config.end_of_line_diagnostics,
@@ -221,7 +221,7 @@ impl EditorView {
         // if we're not at the edge of the screen, draw a right border
         if viewport.right() != view.area.right() {
             let x = area.right();
-            let border_style = theme.get(editor.mode, "ui.window");
+            let border_style = theme.get(editor.theme_context(), "ui.window");
             for y in area.top()..area.bottom() {
                 surface[(x, y)]
                     .set_symbol(tui::symbols::line::VERTICAL)
@@ -257,7 +257,7 @@ impl EditorView {
     ) {
         let editor_rulers = &editor.config().rulers;
         let ruler_theme = theme
-            .try_get(editor.mode, "ui.virtual.ruler")
+            .try_get(editor.theme_context(), "ui.virtual.ruler")
             .unwrap_or_else(|| Style::default().bg(Color::Red));
 
         let rulers = doc
@@ -608,19 +608,27 @@ impl EditorView {
             viewport,
             editor
                 .theme
-                .try_get(editor.mode, "ui.bufferline.background")
-                .unwrap_or_else(|| editor.theme.get(editor.mode, "ui.statusline")),
+                .try_get(editor.theme_context(), "ui.bufferline.background")
+                .unwrap_or_else(|| editor.theme.get(editor.theme_context(), "ui.statusline")),
         );
 
         let bufferline_active = editor
             .theme
-            .try_get(editor.mode, "ui.bufferline.active")
-            .unwrap_or_else(|| editor.theme.get(editor.mode, "ui.statusline.active"));
+            .try_get(editor.theme_context(), "ui.bufferline.active")
+            .unwrap_or_else(|| {
+                editor
+                    .theme
+                    .get(editor.theme_context(), "ui.statusline.active")
+            });
 
         let bufferline_inactive = editor
             .theme
-            .try_get(editor.mode, "ui.bufferline")
-            .unwrap_or_else(|| editor.theme.get(editor.mode, "ui.statusline.inactive"));
+            .try_get(editor.theme_context(), "ui.bufferline")
+            .unwrap_or_else(|| {
+                editor
+                    .theme
+                    .get(editor.theme_context(), "ui.statusline.inactive")
+            });
 
         let mut x = viewport.x;
         let current_doc = view!(editor).doc;
@@ -672,10 +680,11 @@ impl EditorView {
 
         let mut offset = 0;
 
-        let gutter_style = theme.get(editor.mode, "ui.gutter");
-        let gutter_selected_style = theme.get(editor.mode, "ui.gutter.selected");
-        let gutter_style_virtual = theme.get(editor.mode, "ui.gutter.virtual");
-        let gutter_selected_style_virtual = theme.get(editor.mode, "ui.gutter.selected.virtual");
+        let gutter_style = theme.get(editor.theme_context(), "ui.gutter");
+        let gutter_selected_style = theme.get(editor.theme_context(), "ui.gutter.selected");
+        let gutter_style_virtual = theme.get(editor.theme_context(), "ui.gutter.virtual");
+        let gutter_selected_style_virtual =
+            theme.get(editor.theme_context(), "ui.gutter.selected.virtual");
 
         for gutter_type in view.gutters() {
             let mut gutter = gutter_type.style(editor, doc, view, theme, is_focused);
@@ -743,13 +752,13 @@ impl EditorView {
             diagnostic.range.start <= cursor && diagnostic.range.end >= cursor
         });
 
-        let warning = theme.get(editor.mode, "warning");
-        let error = theme.get(editor.mode, "error");
-        let info = theme.get(editor.mode, "info");
-        let hint = theme.get(editor.mode, "hint");
+        let warning = theme.get(editor.theme_context(), "warning");
+        let error = theme.get(editor.theme_context(), "error");
+        let info = theme.get(editor.theme_context(), "info");
+        let hint = theme.get(editor.theme_context(), "hint");
 
         let mut lines = Vec::new();
-        let background_style = theme.get(editor.mode, "ui.background");
+        let background_style = theme.get(editor.theme_context(), "ui.background");
         for diagnostic in diagnostics {
             let style = Style::reset()
                 .patch(background_style)
@@ -806,8 +815,8 @@ impl EditorView {
             .map(|range| range.cursor_line(text))
             .collect();
 
-        let primary_style = theme.get(editor.mode, "ui.cursorline.primary");
-        let secondary_style = theme.get(editor.mode, "ui.cursorline.secondary");
+        let primary_style = theme.get(editor.theme_context(), "ui.cursorline.primary");
+        let secondary_style = theme.get(editor.theme_context(), "ui.cursorline.secondary");
         let viewport = view.area;
 
         move |renderer: &mut TextRenderer, pos: LinePos| {
@@ -835,13 +844,13 @@ impl EditorView {
         // Manual fallback behaviour:
         // ui.cursorcolumn.{p/s} -> ui.cursorcolumn -> ui.cursorline.{p/s}
         let primary_style = theme
-            .try_get_exact(editor.mode, "ui.cursorcolumn.primary")
-            .or_else(|| theme.try_get_exact(editor.mode, "ui.cursorcolumn"))
-            .unwrap_or_else(|| theme.get(editor.mode, "ui.cursorline.primary"));
+            .try_get_exact(editor.theme_context(), "ui.cursorcolumn.primary")
+            .or_else(|| theme.try_get_exact(editor.theme_context(), "ui.cursorcolumn"))
+            .unwrap_or_else(|| theme.get(editor.theme_context(), "ui.cursorline.primary"));
         let secondary_style = theme
-            .try_get_exact(editor.mode, "ui.cursorcolumn.secondary")
-            .or_else(|| theme.try_get_exact(editor.mode, "ui.cursorcolumn"))
-            .unwrap_or_else(|| theme.get(editor.mode, "ui.cursorline.secondary"));
+            .try_get_exact(editor.theme_context(), "ui.cursorcolumn.secondary")
+            .or_else(|| theme.try_get_exact(editor.theme_context(), "ui.cursorcolumn"))
+            .unwrap_or_else(|| theme.get(editor.theme_context(), "ui.cursorline.secondary"));
 
         let inner_area = view.inner_area(doc);
 
@@ -1541,7 +1550,12 @@ impl Component for EditorView {
 
     fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
         // clear with background color
-        surface.set_style(area, cx.editor.theme.get(cx.editor.mode, "ui.background"));
+        surface.set_style(
+            area,
+            cx.editor
+                .theme
+                .get(cx.editor.theme_context(), "ui.background"),
+        );
         let config = cx.editor.config();
 
         // check if bufferline should be rendered
@@ -1585,9 +1599,9 @@ impl Component for EditorView {
             status_msg_width = status_msg.width();
             use helix_view::editor::Severity;
             let style = if *severity == Severity::Error {
-                cx.editor.theme.get(cx.editor.mode, "error")
+                cx.editor.theme.get(cx.editor.theme_context(), "error")
             } else {
-                cx.editor.theme.get(cx.editor.mode, "ui.text")
+                cx.editor.theme.get(cx.editor.theme_context(), "ui.text")
             };
 
             surface.set_string(
@@ -1609,7 +1623,7 @@ impl Component for EditorView {
             for key in &self.pseudo_pending {
                 disp.push_str(&key.key_sequence_format());
             }
-            let style = cx.editor.theme.get(cx.editor.mode, "ui.text");
+            let style = cx.editor.theme.get(cx.editor.theme_context(), "ui.text");
             let macro_width = if cx.editor.macro_recording.is_some() {
                 3
             } else {

helix-term/src/ui/info.rs

@@ -7,8 +7,14 @@ use tui::widgets::{Block, Paragraph, Widget};
 
 impl Component for Info {
     fn render(&mut self, viewport: Rect, surface: &mut Surface, cx: &mut Context) {
-        let text_style = cx.editor.theme.get(cx.editor.mode, "ui.text.info");
-        let popup_style = cx.editor.theme.get(cx.editor.mode, "ui.popup.info");
+        let text_style = cx
+            .editor
+            .theme
+            .get(cx.editor.theme_context(), "ui.text.info");
+        let popup_style = cx
+            .editor
+            .theme
+            .get(cx.editor.theme_context(), "ui.popup.info");
 
         // Calculate the area of the terminal to modify. Because we want to
         // render at the bottom right, we use the viewport's width and height

helix-term/src/ui/lsp/hover.rs

@@ -80,7 +80,7 @@ impl Component for Hover {
         // show header and border only when more than one results
         if let Some(header) = header {
             // header LSP Name
-            let header = header.parse(Some((&cx.editor.theme, cx.editor.mode)));
+            let header = header.parse(Some((&cx.editor.theme, cx.editor.theme_context())));
             let header = Paragraph::new(&header);
             header.render(area.with_height(HEADER_HEIGHT), surface);
 
@@ -95,7 +95,7 @@ impl Component for Hover {
         }
 
         // hover content
-        let contents = contents.parse(Some((&cx.editor.theme, cx.editor.mode)));
+        let contents = contents.parse(Some((&cx.editor.theme, cx.editor.theme_context())));
         let contents_area = area.clip_top(if self.has_header() {
             HEADER_HEIGHT + SEPARATOR_HEIGHT
         } else {

helix-term/src/ui/lsp/signature_help.rs

@@ -119,7 +119,7 @@ impl Component for SignatureHelp {
         let sig_text = crate::ui::markdown::highlighted_code_block(
             signature.signature.as_str(),
             &self.language,
-            Some((&cx.editor.theme, cx.editor.mode)),
+            Some((&cx.editor.theme, cx.editor.theme_context())),
             &self.config_loader.load(),
             active_param_span,
         );
@@ -155,7 +155,7 @@ impl Component for SignatureHelp {
             None => return,
             Some(doc) => Markdown::new(doc.clone(), Arc::clone(&self.config_loader)),
         };
-        let sig_doc = sig_doc.parse(Some((&cx.editor.theme, cx.editor.mode)));
+        let sig_doc = sig_doc.parse(Some((&cx.editor.theme, cx.editor.theme_context())));
         let sig_doc_area = area
             .clip_top(sig_text_area.height + 2)
             .clip_bottom(u16::from(cx.editor.popup_border()));