Pass all paths to file analyzer

Author: Hendrik van Antwerpen

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

@@ -21,6 +21,7 @@ impl FileAnalyzer for TsConfigAnalyzer {
         _file: Handle<File>,
         _path: &Path,
         _source: &'a str,
+        _paths: Vec<&Path>,
         _cancellation_flag: &'a dyn tree_sitter_stack_graphs::CancellationFlag,
     ) -> Result<(), tree_sitter_stack_graphs::LoadError> {
         todo!()

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

@@ -209,23 +209,25 @@ impl TestArgs {
             .with_context(|| format!("Loading builtins into {}", test_path.display()))?;
         let mut globals = Variables::new();
         for test_fragment in &test.fragments {
-            let fragment_path = Path::new(test.graph[test_fragment.file].name()).to_path_buf();
-            if let Some(fa) = fragment_path
+            let all_paths = test.fragments.iter().map(|f| f.path.as_path()).collect();
+            if let Some(fa) = test_fragment
+                .path
                 .file_name()
                 .and_then(|f| lc.special_files.get(&f.to_string_lossy()))
             {
                 fa.build_stack_graph_into(
                     &mut test.graph,
                     test_fragment.file,
-                    &fragment_path,
+                    &test_fragment.path,
                     &test_fragment.source,
+                    all_paths,
                     &NoCancellation,
                 )?;
-            } else if lc.matches_file(&fragment_path, Some(&test_fragment.source)) {
+            } else if lc.matches_file(&test_fragment.path, Some(&test_fragment.source)) {
                 globals.clear();
                 test_fragment.add_globals_to(&mut globals);
                 self.build_fragment_stack_graph_into(
-                    &fragment_path,
+                    &test_fragment.path,
                     &lc.sgl,
                     test_fragment.file,
                     &test_fragment.source,
@@ -235,8 +237,8 @@ impl TestArgs {
             } else {
                 return Err(anyhow!(
                     "Test fragment {} not supported by language of test file {}",
-                    fragment_path.display(),
-                    test_path.display()
+                    test_fragment.path.display(),
+                    test.path.display()
                 ));
             }
         }

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

@@ -945,6 +945,7 @@ pub trait FileAnalyzer {
         file: Handle<File>,
         path: &Path,
         source: &'a str,
+        paths: Vec<&Path>,
         cancellation_flag: &'a dyn CancellationFlag,
     ) -> Result<(), LoadError>;
 }

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

@@ -126,6 +126,7 @@ pub struct Test {
 #[derive(Debug, Clone)]
 pub struct TestFragment {
     pub file: Handle<File>,
+    pub path: PathBuf,
     pub source: String,
     pub assertions: Vec<Assertion>,
     pub globals: HashMap<String, String>,
@@ -167,6 +168,7 @@ impl Test {
                         .for_each(|_| line_files.push(Some(file)));
                     fragments.push(TestFragment {
                         file,
+                        path: current_path,
                         source: current_source,
                         assertions: Vec::new(),
                         globals: current_globals,
@@ -206,6 +208,7 @@ impl Test {
             (line_files.len()..line_count).for_each(|_| line_files.push(Some(file)));
             fragments.push(TestFragment {
                 file,
+                path: current_path,
                 source: current_source,
                 assertions: Vec::new(),
                 globals: current_globals,