feat: Use ThemeKey everywhere when getting Styles

This also means we can avoid allocating `String`s in a lot of cases but means we allocate a `Vec`
more often. Comparing the perf difference is hard but I have not seen Helix slow down because of
this.

Author: poliorcetics

helix-core/src/syntax.rs

@@ -459,7 +459,10 @@ pub fn read_query(language: &str, filename: &str) -> String {
 }
 
 impl LanguageConfiguration {
-    fn initialize_highlight(&self, scopes: &[String]) -> Option<Arc<HighlightConfiguration>> {
+    fn initialize_highlight<T: AsRef<str>>(
+        &self,
+        scopes: &[T],
+    ) -> Option<Arc<HighlightConfiguration>> {
         let highlights_query = read_query(&self.language_id, "highlights.scm");
         // always highlight syntax errors
         // highlights_query += "\n(ERROR) @error";
@@ -493,13 +496,16 @@ impl LanguageConfiguration {
         }
     }
 
-    pub fn reconfigure(&self, scopes: &[String]) {
+    pub fn reconfigure(&self, scopes: &[&str]) {
         if let Some(Some(config)) = self.highlight_config.get() {
             config.configure(scopes);
         }
     }
 
-    pub fn highlight_config(&self, scopes: &[String]) -> Option<Arc<HighlightConfiguration>> {
+    pub fn highlight_config<T: AsRef<str>>(
+        &self,
+        scopes: &[T],
+    ) -> Option<Arc<HighlightConfiguration>> {
         self.highlight_config
             .get_or_init(|| self.initialize_highlight(scopes))
             .clone()
@@ -681,16 +687,17 @@ impl Loader {
         self.language_configs.iter()
     }
 
-    pub fn set_scopes(&self, scopes: Vec<String>) {
-        self.scopes.store(Arc::new(scopes));
+    pub fn set_scopes(&self, scopes: &[&str]) {
+        self.scopes
+            .store(Arc::new(scopes.iter().map(ToString::to_string).collect()));
 
         // Reconfigure existing grammars
         for config in self
             .language_configs
             .iter()
             .filter(|cfg| cfg.is_highlight_initialized())
         {
-            config.reconfigure(&self.scopes());
+            config.reconfigure(scopes);
         }
     }
 
@@ -1568,7 +1575,7 @@ impl HighlightConfiguration {
     ///
     /// When highlighting, results are returned as `Highlight` values, which contain the index
     /// of the matched highlight this list of highlight names.
-    pub fn configure(&self, recognized_names: &[String]) {
+    pub fn configure<T: AsRef<str>>(&self, recognized_names: &[T]) {
         let mut capture_parts = Vec::new();
         let indices: Vec<_> = self
             .query
@@ -1584,7 +1591,7 @@ impl HighlightConfiguration {
                     let recognized_name = recognized_name;
                     let mut len = 0;
                     let mut matches = true;
-                    for (i, part) in recognized_name.split('.').enumerate() {
+                    for (i, part) in recognized_name.as_ref().split('.').enumerate() {
                         match capture_parts.get(i) {
                             Some(capture_part) if *capture_part == part => len += 1,
                             _ => {
@@ -2312,7 +2319,7 @@ mod test {
 
     #[test]
     fn test_parser() {
-        let highlight_names: Vec<String> = [
+        let highlight_names: &[&str] = &[
             "attribute",
             "constant",
             "function.builtin",
@@ -2331,11 +2338,7 @@ mod test {
             "variable",
             "variable.builtin",
             "variable.parameter",
-        ]
-        .iter()
-        .cloned()
-        .map(String::from)
-        .collect();
+        ];
 
         let loader = Loader::new(Configuration { language: vec![] });
 
@@ -2349,7 +2352,7 @@ mod test {
             "", // locals.scm
         )
         .unwrap();
-        config.configure(&highlight_names);
+        config.configure(highlight_names);
 
         let source = Rope::from_str(
             "

helix-core/tests/indent.rs

@@ -38,7 +38,7 @@ fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
     std::env::set_var("HELIX_RUNTIME", runtime.to_str().unwrap());
 
     let language_config = loader.language_config_for_scope(lang_scope).unwrap();
-    let highlight_config = language_config.highlight_config(&[]).unwrap();
+    let highlight_config = language_config.highlight_config::<String>(&[]).unwrap();
     let syntax = Syntax::new(&doc, highlight_config, std::sync::Arc::new(loader));
     let indent_query = language_config.indent_query().unwrap();
     let text = doc.slice(..);

helix-term/src/commands/dap.rs

@@ -8,7 +8,7 @@ use dap::{StackFrame, Thread, ThreadStates};
 use helix_core::syntax::{DebugArgumentValue, DebugConfigCompletion, DebugTemplate};
 use helix_dap::{self as dap, Client};
 use helix_lsp::block_on;
-use helix_view::editor::Breakpoint;
+use helix_view::{editor::Breakpoint, theme::ThemeKey};
 
 use serde_json::{to_value, Value};
 use tokio_stream::wrappers::UnboundedReceiverStream;
@@ -500,9 +500,9 @@ pub fn dap_variables(cx: &mut Context) {
     let mut variables = Vec::new();
 
     let theme = &cx.editor.theme;
-    let scope_style = theme.get("ui.linenr.selected");
-    let type_style = theme.get("ui.text");
-    let text_style = theme.get("ui.text.focus");
+    let scope_style = theme.get(ThemeKey::Ui_Linenr_Selected);
+    let type_style = theme.get(ThemeKey::Ui_Text);
+    let text_style = theme.get(ThemeKey::Ui_Text_Focus);
 
     for scope in scopes.iter() {
         // use helix_view::graphics::Style;

helix-term/src/commands/lsp.rs

@@ -10,7 +10,12 @@ use tui::text::{Span, Spans};
 use super::{align_view, push_jump, Align, Context, Editor, Open};
 
 use helix_core::{path, Selection};
-use helix_view::{apply_transaction, document::Mode, editor::Action, theme::Style};
+use helix_view::{
+    apply_transaction,
+    document::Mode,
+    editor::Action,
+    theme::{Style, ThemeKey},
+};
 
 use crate::{
     compositor::{self, Compositor},
@@ -275,10 +280,10 @@ fn diag_picker(
     }
 
     let styles = DiagnosticStyles {
-        hint: cx.editor.theme.get("hint"),
-        info: cx.editor.theme.get("info"),
-        warning: cx.editor.theme.get("warning"),
-        error: cx.editor.theme.get("error"),
+        hint: cx.editor.theme.get(ThemeKey::Hint),
+        info: cx.editor.theme.get(ThemeKey::Info),
+        warning: cx.editor.theme.get(ThemeKey::Warning),
+        error: cx.editor.theme.get(ThemeKey::Error),
     };
 
     FilePicker::new(

helix-term/src/ui/completion.rs

@@ -1,5 +1,5 @@
 use crate::compositor::{Component, Context, Event, EventResult};
-use helix_view::{apply_transaction, editor::CompleteAction, ViewId};
+use helix_view::{apply_transaction, editor::CompleteAction, theme::ThemeKey, ViewId};
 use tui::buffer::Buffer as Surface;
 use tui::text::Spans;
 
@@ -479,7 +479,7 @@ impl Component for Completion {
             };
 
             // clear area
-            let background = cx.editor.theme.get("ui.popup");
+            let background = cx.editor.theme.get(ThemeKey::Ui_Popup);
             surface.clear_with(area, background);
             markdown_doc.render(area, surface, cx);
         }