feat(test): add attributes for corpus tests

tree-sitter · Feb 27, 2024 · 305efd3 · 305efd3
1 parent e75a362
commit 305efd3
Show file tree

Hide file tree

Showing 3 changed files with 311 additions and 61 deletions.
diff --git a/cli/loader/src/lib.rs b/cli/loader/src/lib.rs
@@ -192,17 +192,17 @@ impl Loader {
         Ok(())
     }
 
-    pub fn languages_at_path(&mut self, path: &Path) -> Result<Vec<Language>> {
+    pub fn languages_at_path(&mut self, path: &Path) -> Result<Vec<(Language, String)>> {
         if let Ok(configurations) = self.find_language_configurations_at_path(path, true) {
             let mut language_ids = configurations
                 .iter()
-                .map(|c| c.language_id)
+                .map(|c| (c.language_id, c.language_name.clone()))
                 .collect::<Vec<_>>();
             language_ids.sort_unstable();
             language_ids.dedup();
             language_ids
                 .into_iter()
-                .map(|id| self.language_for_id(id))
+                .map(|(id, name)| Ok((self.language_for_id(id)?, name)))
                 .collect::<Result<Vec<_>>>()
         } else {
             Ok(Vec::new())
@@ -1118,7 +1118,7 @@ impl Loader {
             .first()
             .cloned()
         {
-            Ok(lang)
+            Ok(lang.0)
         } else if let Some(lang) = self.language_configuration_for_first_line_regex(path)? {
             Ok(lang.0)
         } else {

diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -556,9 +556,10 @@ fn run() -> Result<()> {
             }
 
             let languages = loader.languages_at_path(&current_dir)?;
-            let language = languages
+            let language = &languages
                 .first()
-                .ok_or_else(|| anyhow!("No language found"))?;
+                .ok_or_else(|| anyhow!("No language found"))?
+                .0;
             parser.set_language(language)?;
 
             let test_dir = current_dir.join("test");
@@ -578,6 +579,7 @@ fn run() -> Result<()> {
                     exclude: test_options.exclude,
                     update: test_options.update,
                     open_log: test_options.open_log,
+                    languages: languages.iter().map(|(l, n)| (n.as_str(), l)).collect(),
                 };
 
                 test::run_tests_at_path(&mut parser, &mut opts)?;