summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Nordholts <enselic@gmail.com>2021-08-01 19:08:57 +0200
committerMartin Nordholts <enselic@gmail.com>2021-08-07 22:38:39 +0200
commit47d955a2ab1ae93141abea1bb6348c39856f87c7 (patch)
tree526baf7db22f2df259c23ccc2c8aa6023f4755db
parentbd797c75a4016f7866f2971cc7ebd79fbf7107a4 (diff)
Add code for analyzing dependencies between syntaxes
And also to generate independent SyntaxSets. This will later be used to improve bat startup time.
-rw-r--r--src/assets.rs6
-rw-r--r--src/lib.rs1
-rw-r--r--src/syntax_dependencies.rs184
3 files changed, 191 insertions, 0 deletions
diff --git a/src/assets.rs b/src/assets.rs
index 12a09a65..7c8273fb 100644
--- a/src/assets.rs
+++ b/src/assets.rs
@@ -111,6 +111,12 @@ impl HighlightingAssets {
);
}
+ if std::env::var("BAT_PRINT_SYNTAX_DEPENDENCIES").is_ok() {
+ // To trigger this code, run:
+ // BAT_PRINT_SYNTAX_DEPENDENCIES=1 cargo run -- cache --build --source assets --blank --target /tmp
+ crate::syntax_dependencies::print_syntax_dependencies(&syntax_set_builder);
+ }
+
let syntax_set = syntax_set_builder.build();
let missing_contexts = syntax_set.find_unlinked_contexts();
if !missing_contexts.is_empty() {
diff --git a/src/lib.rs b/src/lib.rs
index 0c41716d..daf241fc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -40,6 +40,7 @@ mod preprocessor;
mod pretty_printer;
pub(crate) mod printer;
pub mod style;
+mod syntax_dependencies;
pub(crate) mod syntax_mapping;
mod terminal;
pub(crate) mod wrapping;
diff --git a/src/syntax_dependencies.rs b/src/syntax_dependencies.rs
new file mode 100644
index 00000000..a6136817
--- /dev/null
+++ b/src/syntax_dependencies.rs
@@ -0,0 +1,184 @@
+use std::collections::HashMap;
+use syntect::parsing::syntax_definition::{
+ ContextReference, MatchOperation, MatchPattern, Pattern, SyntaxDefinition,
+};
+use syntect::parsing::{Scope, SyntaxSet, SyntaxSetBuilder};
+
+type SyntaxName = String;
+
+/// Used to look up what dependencies a given [SyntaxDefinition] has
+type SyntaxToDependencies = HashMap<SyntaxName, Vec<Dependency>>;
+
+/// Used to look up which [SyntaxDefinition] corresponds to a given [Dependency]
+type DependencyToSyntax<'a> = HashMap<Dependency, &'a SyntaxDefinition>;
+
+/// Represents a dependency on an external `.sublime-syntax` file.
+#[derive(Debug, Eq, PartialEq, Clone, Hash)]
+enum Dependency {
+ /// By name. Example YAML: `include: C.sublime-syntax`
+ ByName(String),
+
+ /// By scope. Example YAML: `embed: scope:source.c`
+ ByScope(Scope),
+}
+
+/// Generates independent [SyntaxSet]s after analyzing dependencies between syntaxes
+/// in a [SyntaxSetBuilder], and then prints the reults.
+pub(crate) fn print_syntax_dependencies(syntax_set_builder: &SyntaxSetBuilder) {
+ println!("Constructing independent SyntaxSets...");
+ let independent_syntax_sets = build_independent_syntax_sets(syntax_set_builder);
+
+ println!("Independent SyntaxSets:");
+ for syntax_set in independent_syntax_sets {
+ let names = syntax_set
+ .syntaxes()
+ .iter()
+ .map(|syntax| &syntax.name)
+ .collect::<Vec<_>>();
+ println!("{:?}", names);
+ }
+}
+
+/// Analyzes dependencies between syntaxes in a [SyntaxSetBuilder].
+/// From that, it builds independent [SyntaxSet]s.
+fn build_independent_syntax_sets(
+ syntax_set_builder: &'_ SyntaxSetBuilder,
+) -> impl Iterator<Item = SyntaxSet> + '_ {
+ let syntaxes = syntax_set_builder.syntaxes();
+
+ // Build the data structures we need for dependency resolution
+ let (syntax_to_dependencies, dependency_to_syntax) = generate_maps(syntaxes);
+
+ // Create one independent SyntaxSet from each (non-hidden) SyntaxDefinition
+ syntaxes.iter().filter_map(move |syntax| {
+ if syntax.hidden {
+ return None;
+ }
+
+ let mut builder = SyntaxSetDependencyBuilder::new();
+ builder.add_with_dependencies(syntax, &syntax_to_dependencies, &dependency_to_syntax);
+ Some(builder.build())
+ })
+}
+
+/// In order to analyze dependencies, we need two key pieces of data.
+/// First, when we have a [Dependency], we need to know what [SyntaxDefinition] that
+/// corresponds to. Second, when we have a [SyntaxDefinition], we need to know
+/// what dependencies it has. This functions generates that data for each syntax.
+fn generate_maps(syntaxes: &[SyntaxDefinition]) -> (SyntaxToDependencies, DependencyToSyntax) {
+ let mut syntax_to_dependencies = HashMap::new();
+ let mut dependency_to_syntax = HashMap::new();
+
+ for syntax in syntaxes {
+ syntax_to_dependencies.insert(syntax.name.clone(), dependencies_for_syntax(syntax));
+
+ dependency_to_syntax.insert(Dependency::ByName(syntax.name.clone()), syntax);
+ dependency_to_syntax.insert(Dependency::ByScope(syntax.scope), syntax);
+ }
+
+ (syntax_to_dependencies, dependency_to_syntax)
+}
+
+/// Gets what external dependencies a given [SyntaxDefinition] has.
+/// An external dependency is another `.sublime-syntax` file.
+/// It does that by looking for variants of the following YAML patterns:
+/// - `include: C.sublime-syntax`
+/// - `embed: scope:source.c`
+fn dependencies_for_syntax(syntax: &SyntaxDefinition) -> Vec<Dependency> {
+ let mut dependencies: Vec<Dependency> = syntax
+ .contexts
+ .values()
+ .flat_map(|context| &context.patterns)
+ .flat_map(dependencies_from_pattern)
+ .collect();
+
+ // No need to track a dependency more than once
+ dependencies.dedup();
+
+ dependencies
+}
+
+fn dependencies_from_pattern(pattern: &Pattern) -> Vec<Dependency> {
+ match *pattern {
+ Pattern::Match(MatchPattern {
+ operation: MatchOperation::Push(ref context_references),
+ ..
+ }) => context_references
+ .iter()
+ .map(dependency_from_context_reference)
+ .collect(),
+ Pattern::Include(ref context_reference) => {
+ vec![dependency_from_context_reference(context_reference)]
+ }
+ _ => vec![],
+ }
+ .into_iter()
+ .flatten()
+ .collect()
+}
+
+fn dependency_from_context_reference(context_reference: &ContextReference) -> Option<Dependency> {
+ match &context_reference {
+ ContextReference::File { ref name, .. } => Some(Dependency::ByName(name.clone())),
+ ContextReference::ByScope { ref scope, .. } => Some(Dependency::ByScope(*scope)),
+ _ => None,
+ }
+}
+
+/// Helper to construct a [SyntaxSetBuilder] that contains only [SyntaxDefinition]s
+/// that have dependencies among them.
+struct SyntaxSetDependencyBuilder {
+ syntax_set_builder: SyntaxSetBuilder,
+}
+
+impl SyntaxSetDependencyBuilder {
+ fn new() -> Self {
+ SyntaxSetDependencyBuilder {
+ syntax_set_builder: SyntaxSetBuilder::new(),
+ }
+ }
+
+ /// Add a [SyntaxDefinition] to the underlying [SyntaxSetBuilder].
+ /// Also resolve any dependencies it has and add those [SyntaxDefinition]s too.
+ /// This is a recursive process.
+ fn add_with_dependencies(
+ &mut self,
+ syntax: &SyntaxDefinition,
+ syntax_to_dependencies: &SyntaxToDependencies,
+ dependency_to_syntax: &DependencyToSyntax,
+ ) {
+ let name = &syntax.name;
+ if self.is_syntax_already_added(name) {
+ return;
+ }
+
+ self.syntax_set_builder.add(syntax.clone());
+
+ let dependencies = syntax_to_dependencies.get(name);
+ if dependencies.is_none() {
+ eprintln!("ERROR: Unknown dependencies for {}", name);
+ return;
+ }
+
+ for dependency in dependencies.unwrap() {
+ if let Some(syntax_definition_dependency) = dependency_to_syntax.get(dependency) {
+ self.add_with_dependencies(
+ syntax_definition_dependency,
+ syntax_to_dependencies,
+ dependency_to_syntax,
+ )
+ }
+ }
+ }
+
+ fn is_syntax_already_added(&self, name: &str) -> bool {
+ self.syntax_set_builder
+ .syntaxes()
+ .iter()
+ .any(|syntax| syntax.name == name)
+ }
+
+ fn build(self) -> SyntaxSet {
+ self.syntax_set_builder.build()
+ }
+}