Return file analyzer together with the language configuration so clients do not have to go through a seemingly fallible lookup themselves

Author: Hendrik van Antwerpen

tree-sitter-stack-graphs/src/cli/index.rs

@@ -356,14 +356,7 @@ impl<'a> Indexer<'a> {
                     tsg_str: &lc.sgl.tsg_source(),
                 })?;
         }
-        for lc in lcs.secondary {
-            let fa = match source_path
-                .file_name()
-                .and_then(|file_name| lc.special_files.get(&file_name.to_string_lossy()))
-            {
-                Some(fa) => fa,
-                None => panic!("secondary language missing analyzer"),
-            };
+        for (_, fa) in lcs.secondary {
             fa.build_stack_graph_into(
                 graph,
                 file,

tree-sitter-stack-graphs/src/cli/test.rs

@@ -211,7 +211,7 @@ impl TestArgs {
             .load_for_file(&load_path, &mut file_reader, cancellation_flag)?
             .primary
         {
-            Some(sgl) => sgl,
+            Some(lc) => lc,
             None => return Ok(TestResult::new()),
         };
 

tree-sitter-stack-graphs/src/loader.rs

@@ -348,7 +348,10 @@ pub struct FileLanguageConfigurations<'a> {
     /// The file's primary language. The language configuration's `StackGraphLanguage` should be used to process the file.
     pub primary: Option<&'a LanguageConfiguration>,
     /// Any secondary languages, which have special file analyzers for the file.
-    pub secondary: Vec<&'a LanguageConfiguration>,
+    pub secondary: Vec<(
+        &'a LanguageConfiguration,
+        Arc<dyn FileAnalyzer + Send + Sync>,
+    )>,
 }
 
 impl FileLanguageConfigurations<'_> {
@@ -470,12 +473,11 @@ impl LanguageConfigurationsLoader {
         let primary = LanguageConfiguration::best_for_file(&self.configurations, path, content)?;
         let mut secondary = Vec::new();
         for language in self.configurations.iter() {
-            if path
+            if let Some(fa) = path
                 .file_name()
                 .and_then(|file_name| language.special_files.get(&file_name.to_string_lossy()))
-                .is_some()
             {
-                secondary.push(language);
+                secondary.push((language, fa));
             }
         }
         Ok(FileLanguageConfigurations { primary, secondary })