Use iterator and pass globals to file analyzer

Author: Hendrik van Antwerpen

languages/tree-sitter-stack-graphs-typescript/rust/tsconfig.rs

@@ -5,6 +5,7 @@
 // Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details.
 // ------------------------------------------------------------------------------------------------
 
+use std::collections::HashMap;
 use std::path::Path;
 
 use stack_graphs::arena::Handle;
@@ -16,13 +17,14 @@ pub struct TsConfigAnalyzer {}
 
 impl FileAnalyzer for TsConfigAnalyzer {
     fn build_stack_graph_into<'a>(
-        &'a self,
-        _stack_graph: &'a mut StackGraph,
+        &self,
+        _graph: &mut StackGraph,
         _file: Handle<File>,
         _path: &Path,
-        _source: &'a str,
-        _paths: Vec<&Path>,
-        _cancellation_flag: &'a dyn tree_sitter_stack_graphs::CancellationFlag,
+        _source: &str,
+        _all_paths: &mut dyn Iterator<Item = &'a Path>,
+        _globals: &HashMap<String, String>,
+        _cancellation_flag: &dyn tree_sitter_stack_graphs::CancellationFlag,
     ) -> Result<(), tree_sitter_stack_graphs::LoadError> {
         todo!()
     }

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

@@ -209,7 +209,7 @@ impl TestArgs {
             .with_context(|| format!("Loading builtins into {}", test_path.display()))?;
         let mut globals = Variables::new();
         for test_fragment in &test.fragments {
-            let all_paths = test.fragments.iter().map(|f| f.path.as_path()).collect();
+            let mut all_paths = test.fragments.iter().map(|f| f.path.as_path());
             if let Some(fa) = test_fragment
                 .path
                 .file_name()
@@ -220,7 +220,8 @@ impl TestArgs {
                     test_fragment.file,
                     &test_fragment.path,
                     &test_fragment.source,
-                    all_paths,
+                    &mut all_paths,
+                    &test_fragment.globals,
                     &NoCancellation,
                 )?;
             } else if lc.matches_file(&test_fragment.path, Some(&test_fragment.source)) {

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

@@ -940,12 +940,13 @@ impl<'a> Builder<'a> {
 
 pub trait FileAnalyzer {
     fn build_stack_graph_into<'a>(
-        &'a self,
-        stack_graph: &'a mut StackGraph,
+        &self,
+        stack_graph: &mut StackGraph,
         file: Handle<File>,
         path: &Path,
-        source: &'a str,
-        paths: Vec<&Path>,
-        cancellation_flag: &'a dyn CancellationFlag,
+        source: &str,
+        all_paths: &mut dyn Iterator<Item = &'a Path>,
+        globals: &HashMap<String, String>,
+        cancellation_flag: &dyn CancellationFlag,
     ) -> Result<(), LoadError>;
 }