feat: determine auto-pairs from injection

Author: m4rch3n1ng

helix-term/src/commands.rs

@@ -4152,7 +4152,7 @@ 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);
+        let auto_pairs = doc.auto_pairs(cx.editor, view, doc);
 
         let transaction = auto_pairs
             .as_ref()
@@ -4324,7 +4324,8 @@ pub mod insert {
                 // insert an additional line which is indented one level
                 // more and place the cursor there
                 let on_auto_pair = doc
-                    .auto_pairs(cx.editor)
+                    .auto_pairs(cx.editor, view, doc)
+                    .as_deref()
                     .and_then(|pairs| pairs.get(prev))
                     .is_some_and(|pair| pair.open == prev && pair.close == curr);
 
@@ -4412,7 +4413,9 @@ pub mod insert {
         let text = doc.text().slice(..);
         let tab_width = doc.tab_width();
         let indent_width = doc.indent_width();
-        let auto_pairs = doc.auto_pairs(cx.editor);
+
+        let auto_pairs = doc.auto_pairs(cx.editor, view, doc);
+        let auto_pairs = auto_pairs.as_deref();
 
         let transaction =
             Transaction::delete_by_selection(doc.text(), doc.selection(view.id), |range| {

helix-view/src/document.rs

@@ -2170,7 +2170,12 @@ impl Document {
     /// language config with auto pairs configured, returns that;
     /// otherwise, falls back to the global auto pairs config. If the global
     /// config is false, then ignore language settings.
-    pub fn auto_pairs<'a>(&'a self, editor: &'a Editor) -> Option<&'a AutoPairs> {
+    pub fn auto_pairs<'a>(
+        &'a self,
+        editor: &'a Editor,
+        view: &View,
+        doc: &Document,
+    ) -> Option<Cow<'a, AutoPairs>> {
         let global_config = (editor.auto_pairs).as_ref();
 
         // NOTE: If the user specifies the global auto pairs config as false, then
@@ -2182,10 +2187,18 @@ impl Document {
             }
         }
 
-        match &self.language {
-            Some(lang) => lang.as_ref().auto_pairs.as_ref().or(global_config),
-            None => global_config,
-        }
+        self.syntax
+            .as_ref()
+            .and_then(|syntax| {
+                let selection = self.selection(view.id).primary();
+                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)
+            })
+            .or(global_config.map(Cow::Borrowed))
     }
 
     pub fn snippet_ctx(&self) -> SnippetRenderCtx {