Merge pull request #154 from github/use-language-configuration-more

Reorganize loader

Author: Hendrik van Antwerpen

languages/tree-sitter-stack-graphs-typescript/Cargo.toml

@@ -24,5 +24,6 @@ harness = false
 [dependencies]
 anyhow = "1.0"
 clap = "3"
+stack-graphs = { version = "~0.10.1", path = "../../stack-graphs" }
 tree-sitter-stack-graphs = { version = "~0.4.0", path = "../../tree-sitter-stack-graphs", features=["cli"] }
 tree-sitter-typescript = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev="082da44a5263599186dadafd2c974c19f3a73d28" }

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

@@ -1,7 +1,15 @@
+// -*- coding: utf-8 -*-
+// ------------------------------------------------------------------------------------------------
+// Copyright © 2022, stack-graphs authors.
+// Licensed under either of Apache License, Version 2.0, or MIT license, at your option.
+// Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details.
+// ------------------------------------------------------------------------------------------------
+
 use tree_sitter_stack_graphs::cli::LanguageConfigurationsCli as Cli;
+use tree_sitter_stack_graphs::NoCancellation;
 
 fn main() -> anyhow::Result<()> {
     Cli::main(vec![
-        tree_sitter_stack_graphs_typescript::language_configuration(),
+        tree_sitter_stack_graphs_typescript::language_configuration(&NoCancellation),
     ])
 }

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

@@ -1,5 +1,12 @@
-use tree_sitter_stack_graphs::loader::BuiltinsConfiguration;
+// -*- coding: utf-8 -*-
+// ------------------------------------------------------------------------------------------------
+// Copyright © 2022, stack-graphs authors.
+// Licensed under either of Apache License, Version 2.0, or MIT license, at your option.
+// Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details.
+// ------------------------------------------------------------------------------------------------
+
 use tree_sitter_stack_graphs::loader::LanguageConfiguration;
+use tree_sitter_stack_graphs::CancellationFlag;
 
 /// The stack graphs tsg source for this language
 const STACK_GRAPHS_TSG_SOURCE: &str = include_str!("../src/stack-graphs.tsg");
@@ -9,16 +16,16 @@ const STACK_GRAPHS_BUILTINS_CONFIG: &str = include_str!("../src/builtins.cfg");
 /// The stack graphs builtins source for this language
 const STACK_GRAPHS_BUILTINS_SOURCE: &str = include_str!("../src/builtins.ts");
 
-pub fn language_configuration() -> LanguageConfiguration {
-    LanguageConfiguration {
-        language: tree_sitter_typescript::language_typescript(),
-        scope: Some(String::from("source.ts")),
-        content_regex: None,
-        file_types: vec![String::from("ts")],
-        tsg_source: STACK_GRAPHS_TSG_SOURCE.to_string(),
-        builtins: Some(BuiltinsConfiguration {
-            source: STACK_GRAPHS_BUILTINS_SOURCE.to_string(),
-            config: STACK_GRAPHS_BUILTINS_CONFIG.to_string(),
-        }),
-    }
+pub fn language_configuration(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration {
+    LanguageConfiguration::from_tsg_str(
+        tree_sitter_typescript::language_typescript(),
+        Some(String::from("source.ts")),
+        None,
+        vec![String::from("ts")],
+        STACK_GRAPHS_TSG_SOURCE,
+        Some(STACK_GRAPHS_BUILTINS_SOURCE),
+        Some(STACK_GRAPHS_BUILTINS_CONFIG),
+        cancellation_flag,
+    )
+    .unwrap()
 }

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

@@ -1,10 +1,20 @@
+// -*- coding: utf-8 -*-
+// ------------------------------------------------------------------------------------------------
+// Copyright © 2022, stack-graphs authors.
+// Licensed under either of Apache License, Version 2.0, or MIT license, at your option.
+// Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details.
+// ------------------------------------------------------------------------------------------------
+
 use std::path::PathBuf;
 use tree_sitter_stack_graphs::cli::CiTester;
+use tree_sitter_stack_graphs::NoCancellation;
 
 fn main() -> anyhow::Result<()> {
     let test_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("test");
     CiTester::new(
-        vec![tree_sitter_stack_graphs_typescript::language_configuration()],
+        vec![tree_sitter_stack_graphs_typescript::language_configuration(
+            &NoCancellation,
+        )],
         vec![test_path],
     )
     .run()

languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg

@@ -1,3 +1,10 @@
+; -*- coding: utf-8 -*-
+; ------------------------------------------------------------------------------------------------
+; Copyright © 2022, stack-graphs authors.
+; Licensed under either of Apache License, Version 2.0, or MIT license, at your option.
+; Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details.
+; ------------------------------------------------------------------------------------------------
+
 ; ########################################################################################
 ;
 ; ######## ##    ## ########  ########  ######   ######  ########  #### ########  ########

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

@@ -24,6 +24,7 @@ use walkdir::WalkDir;
 use crate::cli::util::map_parse_errors;
 use crate::cli::util::path_exists;
 use crate::cli::util::PathSpec;
+use crate::loader::LanguageConfiguration;
 use crate::loader::Loader;
 use crate::test::Test;
 use crate::test::TestResult;
@@ -193,7 +194,7 @@ impl TestArgs {
         loader: &mut Loader,
     ) -> anyhow::Result<TestResult> {
         let source = std::fs::read_to_string(test_path)?;
-        let sgl = match loader.load_for_file(test_path, Some(&source), &NoCancellation)? {
+        let lc = match loader.load_for_file(test_path, Some(&source), &NoCancellation)? {
             Some(sgl) => sgl,
             None => {
                 if self.show_ignored {
@@ -204,28 +205,29 @@ impl TestArgs {
         };
         let default_fragment_path = test_path.strip_prefix(test_root).unwrap();
         let mut test = Test::from_source(&test_path, &source, default_fragment_path)?;
-        self.load_builtins_into(sgl, &mut test.graph)
+        self.load_builtins_into(&lc, &mut test.graph)
             .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 test_path.extension() != fragment_path.extension() {
+            if lc.matches_file(&fragment_path, Some(&test_fragment.source)) {
+                globals.clear();
+                test_fragment.add_globals_to(&mut globals);
+                self.build_fragment_stack_graph_into(
+                    &fragment_path,
+                    &lc.sgl,
+                    test_fragment.file,
+                    &test_fragment.source,
+                    &globals,
+                    &mut test.graph,
+                )?;
+            } else {
                 return Err(anyhow!(
-                    "Test fragment {} has different file extension than test file {}",
+                    "Test fragment {} not supported by language of test file {}",
                     fragment_path.display(),
                     test_path.display()
                 ));
             }
-            globals.clear();
-            test_fragment.add_globals_to(&mut globals);
-            self.build_fragment_stack_graph_into(
-                &fragment_path,
-                sgl,
-                test_fragment.file,
-                &test_fragment.source,
-                &globals,
-                &mut test.graph,
-            )?;
         }
         let result = test.run(&NoCancellation)?;
         let success = self.handle_result(test_path, &result)?;
@@ -245,10 +247,10 @@ impl TestArgs {
 
     fn load_builtins_into(
         &self,
-        sgl: &mut StackGraphLanguage,
+        lc: &LanguageConfiguration,
         graph: &mut StackGraph,
     ) -> anyhow::Result<()> {
-        if let Err(h) = graph.add_from_graph(sgl.builtins()) {
+        if let Err(h) = graph.add_from_graph(&lc.builtins) {
             return Err(anyhow!("Duplicate builtin file {}", &graph[h]));
         }
         Ok(())
@@ -257,7 +259,7 @@ impl TestArgs {
     fn build_fragment_stack_graph_into(
         &self,
         test_path: &Path,
-        sgl: &mut StackGraphLanguage,
+        sgl: &StackGraphLanguage,
         file: Handle<File>,
         source: &str,
         globals: &Variables,

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

@@ -331,14 +331,16 @@ use tree_sitter_graph::graph::Value;
 use tree_sitter_graph::parse_error::ParseError;
 use tree_sitter_graph::parse_error::TreeWithParseErrorVec;
 use tree_sitter_graph::ExecutionConfig;
-use tree_sitter_graph::Variables;
 
 #[cfg(feature = "cli")]
 pub mod cli;
 pub mod functions;
 pub mod loader;
 pub mod test;
 
+pub use tree_sitter_graph::VariableError;
+pub use tree_sitter_graph::Variables;
+
 // Node type values
 static DROP_SCOPES_TYPE: &'static str = "drop_scopes";
 static POP_SCOPED_SYMBOL_TYPE: &'static str = "pop_scoped_symbol";
@@ -387,7 +389,6 @@ pub struct StackGraphLanguage {
     language: tree_sitter::Language,
     tsg: tree_sitter_graph::ast::File,
     functions: Functions,
-    builtins: StackGraph,
 }
 
 impl StackGraphLanguage {
@@ -402,7 +403,6 @@ impl StackGraphLanguage {
             language,
             tsg,
             functions: Self::default_functions(),
-            builtins: StackGraph::new(),
         })
     }
 
@@ -417,7 +417,6 @@ impl StackGraphLanguage {
             language,
             tsg,
             functions: Self::default_functions(),
-            builtins: StackGraph::new(),
         })
     }
 
@@ -431,14 +430,6 @@ impl StackGraphLanguage {
         &mut self.functions
     }
 
-    pub fn builtins(&self) -> &StackGraph {
-        &self.builtins
-    }
-
-    pub fn builtins_mut(&mut self) -> &mut StackGraph {
-        &mut self.builtins
-    }
-
     pub fn language(&self) -> tree_sitter::Language {
         self.language
     }