diff --git a/Cargo.lock b/Cargo.lock index b723e434..5060ad7a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3598,7 +3598,7 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "async-trait", @@ -3636,7 +3636,7 @@ dependencies = [ [[package]] name = "tinymist-query" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "comemo 0.4.0", diff --git a/crates/tinymist-query/src/fixtures/document_symbols/test@base.typ.snap b/crates/tinymist-query/src/fixtures/document_symbols/snaps/test@base.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/document_symbols/test@base.typ.snap rename to crates/tinymist-query/src/fixtures/document_symbols/snaps/test@base.typ.snap diff --git a/crates/tinymist-query/src/fixtures/document_symbols/test@func.typ.snap b/crates/tinymist-query/src/fixtures/document_symbols/snaps/test@func.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/document_symbols/test@func.typ.snap rename to crates/tinymist-query/src/fixtures/document_symbols/snaps/test@func.typ.snap diff --git a/crates/tinymist-query/src/fixtures/document_symbols/test@headings-in-blocks.typ.snap b/crates/tinymist-query/src/fixtures/document_symbols/snaps/test@headings-in-blocks.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/document_symbols/test@headings-in-blocks.typ.snap rename to crates/tinymist-query/src/fixtures/document_symbols/snaps/test@headings-in-blocks.typ.snap diff --git a/crates/tinymist-query/src/fixtures/document_symbols/test@nested-blocks.typ.snap b/crates/tinymist-query/src/fixtures/document_symbols/snaps/test@nested-blocks.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/document_symbols/test@nested-blocks.typ.snap rename to crates/tinymist-query/src/fixtures/document_symbols/snaps/test@nested-blocks.typ.snap diff --git a/crates/tinymist-query/src/fixtures/folding_range/test@array_folding.typ.snap b/crates/tinymist-query/src/fixtures/folding_range/snaps/test@array_folding.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/folding_range/test@array_folding.typ.snap rename to crates/tinymist-query/src/fixtures/folding_range/snaps/test@array_folding.typ.snap diff --git a/crates/tinymist-query/src/fixtures/folding_range/test@base.typ.snap b/crates/tinymist-query/src/fixtures/folding_range/snaps/test@base.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/folding_range/test@base.typ.snap rename to crates/tinymist-query/src/fixtures/folding_range/snaps/test@base.typ.snap diff --git a/crates/tinymist-query/src/fixtures/folding_range/test@headings-in-blocks.typ.snap b/crates/tinymist-query/src/fixtures/folding_range/snaps/test@headings-in-blocks.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/folding_range/test@headings-in-blocks.typ.snap rename to crates/tinymist-query/src/fixtures/folding_range/snaps/test@headings-in-blocks.typ.snap diff --git a/crates/tinymist-query/src/fixtures/folding_range/test@nested-blocks.typ.snap b/crates/tinymist-query/src/fixtures/folding_range/snaps/test@nested-blocks.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/folding_range/test@nested-blocks.typ.snap rename to crates/tinymist-query/src/fixtures/folding_range/snaps/test@nested-blocks.typ.snap diff --git a/crates/tinymist-query/src/fixtures/folding_range/test@paren_folding.typ.snap b/crates/tinymist-query/src/fixtures/folding_range/snaps/test@paren_folding.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/folding_range/test@paren_folding.typ.snap rename to crates/tinymist-query/src/fixtures/folding_range/snaps/test@paren_folding.typ.snap diff --git a/crates/tinymist-query/src/fixtures/goto_definition/test@base.typ.snap b/crates/tinymist-query/src/fixtures/goto_definition/snaps/test@base.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/goto_definition/test@base.typ.snap rename to crates/tinymist-query/src/fixtures/goto_definition/snaps/test@base.typ.snap diff --git a/crates/tinymist-query/src/fixtures/goto_definition/test@import_alias.typ.snap b/crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_alias.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/goto_definition/test@import_alias.typ.snap rename to crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_alias.typ.snap diff --git a/crates/tinymist-query/src/fixtures/goto_definition/test@import_ident.typ.snap b/crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_ident.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/goto_definition/test@import_ident.typ.snap rename to crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_ident.typ.snap diff --git a/crates/tinymist-query/src/fixtures/goto_definition/test@import_new_name.typ.snap b/crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_new_name.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/goto_definition/test@import_new_name.typ.snap rename to crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_new_name.typ.snap diff --git a/crates/tinymist-query/src/fixtures/goto_definition/test@import_path_inner.typ.snap b/crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_path_inner.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/goto_definition/test@import_path_inner.typ.snap rename to crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_path_inner.typ.snap diff --git a/crates/tinymist-query/src/fixtures/goto_definition/test@import_self.typ.snap b/crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_self.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/goto_definition/test@import_self.typ.snap rename to crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_self.typ.snap diff --git a/crates/tinymist-query/src/fixtures/goto_definition/test@import_star.typ.snap b/crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_star.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/goto_definition/test@import_star.typ.snap rename to crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_star.typ.snap diff --git a/crates/tinymist-query/src/fixtures/goto_definition/test@import_star_variable.typ.snap b/crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_star_variable.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/goto_definition/test@import_star_variable.typ.snap rename to crates/tinymist-query/src/fixtures/goto_definition/snaps/test@import_star_variable.typ.snap diff --git a/crates/tinymist-query/src/fixtures/goto_definition/test@paren.typ.snap b/crates/tinymist-query/src/fixtures/goto_definition/snaps/test@paren.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/goto_definition/test@paren.typ.snap rename to crates/tinymist-query/src/fixtures/goto_definition/snaps/test@paren.typ.snap diff --git a/crates/tinymist-query/src/fixtures/goto_definition/test@paren_lhs.typ.snap b/crates/tinymist-query/src/fixtures/goto_definition/snaps/test@paren_lhs.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/goto_definition/test@paren_lhs.typ.snap rename to crates/tinymist-query/src/fixtures/goto_definition/snaps/test@paren_lhs.typ.snap diff --git a/crates/tinymist-query/src/fixtures/goto_definition/test@variable.typ.snap b/crates/tinymist-query/src/fixtures/goto_definition/snaps/test@variable.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/goto_definition/test@variable.typ.snap rename to crates/tinymist-query/src/fixtures/goto_definition/snaps/test@variable.typ.snap diff --git a/crates/tinymist-query/src/fixtures/inlay_hints/test@base.typ.snap b/crates/tinymist-query/src/fixtures/inlay_hints/snaps/test@base.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/inlay_hints/test@base.typ.snap rename to crates/tinymist-query/src/fixtures/inlay_hints/snaps/test@base.typ.snap diff --git a/crates/tinymist-query/src/fixtures/inlay_hints/test@imcomplete-expression.typ.snap b/crates/tinymist-query/src/fixtures/inlay_hints/snaps/test@imcomplete-expression.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/inlay_hints/test@imcomplete-expression.typ.snap rename to crates/tinymist-query/src/fixtures/inlay_hints/snaps/test@imcomplete-expression.typ.snap diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/def_use@base.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@base.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/lexical_hierarchy/def_use@base.typ.snap rename to crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@base.typ.snap diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/def_use@destructing.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@destructing.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/lexical_hierarchy/def_use@destructing.typ.snap rename to crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@destructing.typ.snap diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/def_use@dict.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@dict.typ.snap similarity index 93% rename from crates/tinymist-query/src/fixtures/lexical_hierarchy/def_use@dict.typ.snap rename to crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@dict.typ.snap index a8bcd1bd..8918c763 100644 --- a/crates/tinymist-query/src/fixtures/lexical_hierarchy/def_use@dict.typ.snap +++ b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@dict.typ.snap @@ -19,8 +19,8 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/dict.typ "range": "5:6" }, "refs": [ - "z@43..44", - "z@30..31" + "z@30..31", + "z@43..44" ] } } diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/def_use@func.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@func.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/lexical_hierarchy/def_use@func.typ.snap rename to crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@func.typ.snap diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/def_use@redefine.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@redefine.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/lexical_hierarchy/def_use@redefine.typ.snap rename to crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@redefine.typ.snap diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/scope@base.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@base.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/lexical_hierarchy/scope@base.typ.snap rename to crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@base.typ.snap diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/scope@destructing.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@destructing.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/lexical_hierarchy/scope@destructing.typ.snap rename to crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@destructing.typ.snap diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/scope@dict.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@dict.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/lexical_hierarchy/scope@dict.typ.snap rename to crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@dict.typ.snap diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/scope@func.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@func.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/lexical_hierarchy/scope@func.typ.snap rename to crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@func.typ.snap diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/scope@redefine.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@redefine.typ.snap similarity index 100% rename from crates/tinymist-query/src/fixtures/lexical_hierarchy/scope@redefine.typ.snap rename to crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@redefine.typ.snap diff --git a/crates/tinymist-query/src/lib.rs b/crates/tinymist-query/src/lib.rs index abaa2a8d..32b163ee 100644 --- a/crates/tinymist-query/src/lib.rs +++ b/crates/tinymist-query/src/lib.rs @@ -176,7 +176,7 @@ mod tests { pub fn snapshot_testing(name: &str, f: &impl Fn(&mut TypstSystemWorld, PathBuf)) { let mut settings = insta::Settings::new(); settings.set_prepend_module_to_snapshot(false); - settings.set_snapshot_path(format!("fixtures/{name}")); + settings.set_snapshot_path(format!("fixtures/{name}/snaps")); settings.bind(|| { let glob_path = format!("fixtures/{name}/*.typ"); insta::glob!(&glob_path, |path| {