perf: save a clone in the fn auto_pairs

Author: m4rch3n1ng

helix-term/src/commands.rs

@@ -58,6 +58,7 @@ use helix_view::{
 };
 
 use anyhow::{anyhow, bail, ensure, Context as _};
+use arc_swap::access::DynAccess;
 use insert::*;
 use movement::Movement;
 
@@ -4152,7 +4153,9 @@ pub mod insert {
         let (view, doc) = current_ref!(cx.editor);
         let text = doc.text();
         let selection = doc.selection(view.id);
-        let auto_pairs = doc.auto_pairs(cx.editor, view, doc);
+
+        let loader: &helix_core::syntax::Loader = &cx.editor.syn_loader.load();
+        let auto_pairs = doc.auto_pairs(cx.editor, loader, view, doc);
 
         let transaction = auto_pairs
             .as_ref()
@@ -4320,11 +4323,12 @@ pub mod insert {
                     ),
                 };
 
+                let loader: &helix_core::syntax::Loader = &cx.editor.syn_loader.load();
                 // If we are between pairs (such as brackets), we want to
                 // insert an additional line which is indented one level
                 // more and place the cursor there
                 let on_auto_pair = doc
-                    .auto_pairs(cx.editor, view, doc)
+                    .auto_pairs(cx.editor, loader, view, doc)
                     .as_deref()
                     .and_then(|pairs| pairs.get(prev))
                     .is_some_and(|pair| pair.open == prev && pair.close == curr);
@@ -4414,8 +4418,8 @@ pub mod insert {
         let tab_width = doc.tab_width();
         let indent_width = doc.indent_width();
 
-        let auto_pairs = doc.auto_pairs(cx.editor, view, doc);
-        let auto_pairs = auto_pairs.as_deref();
+        let loader: &helix_core::syntax::Loader = &cx.editor.syn_loader.load();
+        let auto_pairs = doc.auto_pairs(cx.editor, loader, view, doc);
 
         let transaction =
             Transaction::delete_by_selection(doc.text(), doc.selection(view.id), |range| {

helix-view/src/document.rs

@@ -2173,9 +2173,10 @@ impl Document {
     pub fn auto_pairs<'a>(
         &'a self,
         editor: &'a Editor,
+        loader: &'a syntax::Loader,
         view: &View,
         doc: &Document,
-    ) -> Option<Cow<'a, AutoPairs>> {
+    ) -> Option<&'a AutoPairs> {
         let global_config = (editor.auto_pairs).as_ref();
 
         // NOTE: If the user specifies the global auto pairs config as false, then
@@ -2194,11 +2195,10 @@ impl Document {
                 let (start, end) = selection.into_byte_range(doc.text().slice(..));
                 let layer = syntax.layer_for_byte_range(start as u32, end as u32);
 
-                let loader: &syntax::Loader = &editor.syn_loader.load();
                 let lang_config = loader.language(syntax.layer(layer).language).config();
-                lang_config.auto_pairs.clone().map(Cow::Owned)
+                lang_config.auto_pairs.as_ref()
             })
-            .or(global_config.map(Cow::Borrowed))
+            .or(global_config)
     }
 
     pub fn snippet_ctx(&self) -> SnippetRenderCtx {