Add convenience method for constructing LanguageConfiguration from sources

Author: Hendrik van Antwerpen

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

@@ -5,12 +5,8 @@
 // Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details.
 // ------------------------------------------------------------------------------------------------
 
-use stack_graphs::graph::StackGraph;
 use tree_sitter_stack_graphs::loader::LanguageConfiguration;
-use tree_sitter_stack_graphs::loader::Loader;
 use tree_sitter_stack_graphs::CancellationFlag;
-use tree_sitter_stack_graphs::StackGraphLanguage;
-use tree_sitter_stack_graphs::Variables;
 
 /// The stack graphs tsg source for this language
 const STACK_GRAPHS_TSG_SOURCE: &str = include_str!("../src/stack-graphs.tsg");
@@ -21,27 +17,15 @@ const STACK_GRAPHS_BUILTINS_CONFIG: &str = include_str!("../src/builtins.cfg");
 const STACK_GRAPHS_BUILTINS_SOURCE: &str = include_str!("../src/builtins.ts");
 
 pub fn language_configuration(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration {
-    let language = tree_sitter_typescript::language_typescript();
-    let sgl = StackGraphLanguage::from_str(language, STACK_GRAPHS_TSG_SOURCE).unwrap();
-    let mut builtins = StackGraph::new();
-    let file = builtins.add_file("<builtins>").unwrap();
-    let mut builtins_globals = Variables::new();
-    Loader::load_globals_from_config_str(STACK_GRAPHS_BUILTINS_CONFIG, &mut builtins_globals)
-        .unwrap();
-    sgl.build_stack_graph_into(
-        &mut builtins,
-        file,
-        STACK_GRAPHS_BUILTINS_SOURCE,
-        &builtins_globals,
+    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();
-    LanguageConfiguration {
-        language,
-        scope: Some(String::from("source.ts")),
-        content_regex: None,
-        file_types: vec![String::from("ts")],
-        sgl,
-        builtins,
-    }
+    .unwrap()
 }

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

@@ -45,6 +45,42 @@ pub struct LanguageConfiguration {
 }
 
 impl LanguageConfiguration {
+    pub fn from_tsg_str(
+        language: Language,
+        scope: Option<String>,
+        content_regex: Option<Regex>,
+        file_types: Vec<String>,
+        tsg_source: &str,
+        builtins_source: Option<&str>,
+        builtins_config: Option<&str>,
+        cancellation_flag: &dyn CancellationFlag,
+    ) -> Result<Self, LoadError> {
+        let sgl = StackGraphLanguage::from_str(language, tsg_source)?;
+        let mut builtins = StackGraph::new();
+        if let Some(builtins_source) = builtins_source {
+            let mut builtins_globals = Variables::new();
+            if let Some(builtins_config) = builtins_config {
+                Loader::load_globals_from_config_str(builtins_config, &mut builtins_globals)?;
+            }
+            let file = builtins.add_file("<builtins>").unwrap();
+            sgl.build_stack_graph_into(
+                &mut builtins,
+                file,
+                builtins_source,
+                &builtins_globals,
+                cancellation_flag,
+            )?;
+        }
+        Ok(LanguageConfiguration {
+            language,
+            scope,
+            content_regex,
+            file_types,
+            sgl,
+            builtins,
+        })
+    }
+
     pub fn matches_file(&self, path: &Path, content: Option<&str>) -> bool {
         matches_file(&self.file_types, &self.content_regex, path, content).is_some()
     }