From 81ed159e9023d2705f9cd2f3a65dcbd89b80f4d3 Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin <35292584+Myriad-Dreamin@users.noreply.github.com> Date: Sat, 23 Mar 2024 09:16:32 +0800 Subject: [PATCH] dev: test libraries in CI (#69) * fix: canonicalize line feed for testing * dev: test libraries in CI * build: remove wrapper --- .github/workflows/release.yml | 16 +++++++++++----- .../def_use/snaps/def_use@base.typ-2.snap | 2 +- .../def_use/snaps/def_use@base2.typ.snap | 4 ++-- .../def_use/snaps/def_use@import_alias.typ.snap | 10 +++++----- .../snaps/def_use@import_alias_both.typ.snap | 16 ++++++++-------- .../def_use/snaps/def_use@import_ident.typ.snap | 10 +++++----- .../snaps/def_use@import_ident_alias.typ.snap | 12 ++++++------ .../def_use/snaps/def_use@import_star.typ.snap | 6 +++--- .../snaps/def_use@import_star_recursive.typ.snap | 8 ++++---- .../def_use/snaps/def_use@param_scope.typ.snap | 2 +- .../snaps/def_use@base.typ.snap | 2 +- .../snaps/def_use@destructing.typ.snap | 12 ++++++------ .../snaps/def_use@dict.typ.snap | 8 ++++---- .../snaps/def_use@func.typ.snap | 10 +++++----- .../snaps/def_use@import.typ.snap | 2 +- .../snaps/def_use@redefine.typ.snap | 6 +++--- .../lexical_hierarchy/snaps/scope@base.typ.snap | 2 +- .../snaps/scope@destructing.typ.snap | 8 ++++---- .../lexical_hierarchy/snaps/scope@dict.typ.snap | 6 +++--- .../lexical_hierarchy/snaps/scope@func.typ.snap | 8 ++++---- .../snaps/scope@import.typ.snap | 2 +- .../snaps/scope@redefine.typ.snap | 4 ++-- .../snaps/test@content-block.typ.snap | 2 +- .../semantic_tokens/snaps/test@fn2.typ.snap | 2 +- .../snaps/test@typst_lsp_issue_264.typ.snap | 2 +- .../snaps/test@typst_lsp_issue_401.typ.snap | 2 +- crates/tinymist-query/src/tests.rs | 2 ++ 27 files changed, 87 insertions(+), 79 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 136b7817..9f930cf6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,6 @@ env: CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc SCCACHE_GHA_ENABLED: "true" - RUSTC_WRAPPER: "sccache" jobs: pre_build: @@ -76,9 +75,6 @@ jobs: with: submodules: recursive if: (startsWith(github.ref, 'refs/tags/') || matrix.regular_build == 'true') - - name: Run sccache-cache - uses: mozilla-actions/sccache-action@v0.0.4 - if: (startsWith(github.ref, 'refs/tags/') || matrix.regular_build == 'true') - name: Install Node.js uses: actions/setup-node@v4 with: @@ -121,6 +117,11 @@ jobs: run: | cargo build --release -p tinymist --target ${{ matrix.rust-target }} if: startsWith(github.ref, 'refs/tags/') || matrix.regular_build == 'true' + - name: Test tinymist + shell: pwsh + run: | + cargo test --release --workspace --target ${{ matrix.rust-target }} + if: (startsWith(github.ref, 'refs/tags/') || matrix.regular_build == 'true') && (matrix.platform == 'linux') - name: Rename debug symbols for windows if: matrix.platform == 'win32' && (startsWith(github.ref, 'refs/tags/') || matrix.regular_build == 'true') run: | @@ -211,7 +212,11 @@ jobs: - name: Build tinymist binary run: | cargo build --release -p tinymist --target $RUST_TARGET - mkdir -p editors/vscode/out + - name: Test tinymist + shell: pwsh + run: | + cargo test --release --workspace --target ${{ matrix.rust-target }} + if: startsWith(github.ref, 'refs/tags/') || matrix.regular_build == 'true' - name: Split debug symbols run: | cd target/$RUST_TARGET/release @@ -224,6 +229,7 @@ jobs: path: target/${{ env.RUST_TARGET }}/release/tinymist-${{ env.target }}.debug - name: Copy binary to output directory run: | + mkdir -p editors/vscode/out cp "target/${{ env.RUST_TARGET }}/release/tinymist" "editors/vscode/out/" cp "target/${{ env.RUST_TARGET }}/release/tinymist" "tinymist-${{ env.target }}" - name: Upload binary artifact diff --git a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@base.typ-2.snap b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@base.typ-2.snap index 56eb4d11..16e19fb1 100644 --- a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@base.typ-2.snap +++ b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@base.typ-2.snap @@ -13,7 +13,7 @@ input_file: crates/tinymist-query/src/fixtures/def_use/base.typ "range": "5:6" }, "refs": [ - "x@14..15" + "x@13..14" ] } } diff --git a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@base2.typ.snap b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@base2.typ.snap index 3711bc90..c7d2e20c 100644 --- a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@base2.typ.snap +++ b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@base2.typ.snap @@ -4,13 +4,13 @@ expression: "JsonRepr::new_redacted(result, &REDACT_LOC)" input_file: crates/tinymist-query/src/fixtures/def_use/base2.typ --- { - "y@28..29@s0.typ": { + "y@27..28@s0.typ": { "def": { "kind": { "Var": "Variable" }, "name": "y", - "range": "28:29" + "range": "27:28" }, "refs": [] } diff --git a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_alias.typ.snap b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_alias.typ.snap index f11b9052..644f2ae1 100644 --- a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_alias.typ.snap +++ b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_alias.typ.snap @@ -13,20 +13,20 @@ input_file: crates/tinymist-query/src/fixtures/def_use/import_alias.typ "range": "8:18" }, "refs": [ - "base@21..25", - "base@55..59" + "base@20..24", + "base@52..56" ] }, - "foo@49..52@s0.typ": { + "foo@47..50@s0.typ": { "def": { "kind": { "Mod": "ModuleAlias" }, "name": "foo", - "range": "49:52" + "range": "47:50" }, "refs": [ - "foo@62..65" + "foo@59..62" ] } } diff --git a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_alias_both.typ.snap b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_alias_both.typ.snap index da0bcbab..4b9120ea 100644 --- a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_alias_both.typ.snap +++ b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_alias_both.typ.snap @@ -13,34 +13,34 @@ input_file: crates/tinymist-query/src/fixtures/def_use/import_alias_both.typ "range": "8:18" }, "refs": [ - "base@21..25", - "base@65..69" + "base@20..24", + "base@62..66" ] }, - "foo@49..52@s0.typ": { + "foo@47..50@s0.typ": { "def": { "kind": { "Mod": "ModuleAlias" }, "name": "foo", - "range": "49:52" + "range": "47:50" }, "refs": [] }, - "foo@59..62@s0.typ": { + "foo@57..60@s0.typ": { "def": { "kind": { "Mod": { "Alias": { - "target": "x@54..55" + "target": "x@52..53" } } }, "name": "foo", - "range": "59:62" + "range": "57:60" }, "refs": [ - "foo@72..75" + "foo@69..72" ] } } diff --git a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_ident.typ.snap b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_ident.typ.snap index f9ae3649..33d512dc 100644 --- a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_ident.typ.snap +++ b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_ident.typ.snap @@ -13,20 +13,20 @@ input_file: crates/tinymist-query/src/fixtures/def_use/import_ident.typ "range": "8:18" }, "refs": [ - "base@21..25", - "base@51..55" + "base@20..24", + "base@48..52" ] }, - "x@47..48@s0.typ": { + "x@45..46@s0.typ": { "def": { "kind": { "Mod": "Ident" }, "name": "x", - "range": "47:48" + "range": "45:46" }, "refs": [ - "x@58..59" + "x@55..56" ] } } diff --git a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_ident_alias.typ.snap b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_ident_alias.typ.snap index d61e92b8..5ff3702d 100644 --- a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_ident_alias.typ.snap +++ b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_ident_alias.typ.snap @@ -13,24 +13,24 @@ input_file: crates/tinymist-query/src/fixtures/def_use/import_ident_alias.typ "range": "8:18" }, "refs": [ - "base@21..25", - "base@58..62" + "base@20..24", + "base@55..59" ] }, - "foo@52..55@s0.typ": { + "foo@50..53@s0.typ": { "def": { "kind": { "Mod": { "Alias": { - "target": "x@47..48" + "target": "x@45..46" } } }, "name": "foo", - "range": "52:55" + "range": "50:53" }, "refs": [ - "foo@65..68" + "foo@62..65" ] } } diff --git a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_star.typ.snap b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_star.typ.snap index 6c24dec4..8828c24e 100644 --- a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_star.typ.snap +++ b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_star.typ.snap @@ -13,8 +13,8 @@ input_file: crates/tinymist-query/src/fixtures/def_use/import_star.typ "range": "8:18" }, "refs": [ - "base@21..25", - "base@51..55" + "base@20..24", + "base@48..52" ] }, "x@5..6@base.typ": { @@ -26,7 +26,7 @@ input_file: crates/tinymist-query/src/fixtures/def_use/import_star.typ "range": "5:6" }, "refs": [ - "x@58..59" + "x@55..56" ] } } diff --git a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_star_recursive.typ.snap b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_star_recursive.typ.snap index 4aadf0e6..65b21b91 100644 --- a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_star_recursive.typ.snap +++ b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@import_star_recursive.typ.snap @@ -13,19 +13,19 @@ input_file: crates/tinymist-query/src/fixtures/def_use/import_star_recursive.typ "range": "5:6" }, "refs": [ - "x@25..26" + "x@24..25" ] }, - "y@28..29@base2.typ": { + "y@27..28@base2.typ": { "def": { "kind": { "Var": "Variable" }, "name": "y", - "range": "28:29" + "range": "27:28" }, "refs": [ - "y@29..30" + "y@28..29" ] } } diff --git a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@param_scope.typ.snap b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@param_scope.typ.snap index 8ce7c965..53ab2e24 100644 --- a/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@param_scope.typ.snap +++ b/crates/tinymist-query/src/fixtures/def_use/snaps/def_use@param_scope.typ.snap @@ -25,7 +25,7 @@ input_file: crates/tinymist-query/src/fixtures/def_use/param_scope.typ "range": "5:9" }, "refs": [ - "term@26..30" + "term@25..29" ] } } diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@base.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@base.typ.snap index de75dafa..5b5fc8fa 100644 --- a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@base.typ.snap +++ b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@base.typ.snap @@ -13,7 +13,7 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/base.typ "range": "5:6" }, "refs": [ - "x@14..15" + "x@13..14" ] } } diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@destructing.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@destructing.typ.snap index 34f37351..4da49fd4 100644 --- a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@destructing.typ.snap +++ b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@destructing.typ.snap @@ -4,13 +4,13 @@ expression: "JsonRepr::new_redacted(result, &REDACT_LOC)" input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/destructing.typ --- { - "a@29..30@s0.typ": { + "a@28..29@s0.typ": { "def": { "kind": { "Var": "Variable" }, "name": "a", - "range": "29:30" + "range": "28:29" }, "refs": [] }, @@ -23,16 +23,16 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/destructing.typ "range": "6:7" }, "refs": [ - "a@41..42" + "a@40..41" ] }, - "b@32..33@s0.typ": { + "b@31..32@s0.typ": { "def": { "kind": { "Var": "Variable" }, "name": "b", - "range": "32:33" + "range": "31:32" }, "refs": [] }, @@ -45,7 +45,7 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/destructing.typ "range": "9:10" }, "refs": [ - "b@38..39" + "b@37..38" ] } } diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@dict.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@dict.typ.snap index 6c07bc02..61d43d77 100644 --- a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@dict.typ.snap +++ b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@dict.typ.snap @@ -4,13 +4,13 @@ expression: "JsonRepr::new_redacted(result, &REDACT_LOC)" input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/dict.typ --- { - "x@18..19@s0.typ": { + "x@17..18@s0.typ": { "def": { "kind": { "Var": "Variable" }, "name": "x", - "range": "18:19" + "range": "17:18" }, "refs": [] }, @@ -23,8 +23,8 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/dict.typ "range": "5:6" }, "refs": [ - "z@30..31", - "z@43..44" + "z@28..29", + "z@40..41" ] } } diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@func.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@func.typ.snap index ef9a8f9e..81137d5d 100644 --- a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@func.typ.snap +++ b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@func.typ.snap @@ -4,25 +4,25 @@ expression: "JsonRepr::new_redacted(result, &REDACT_LOC)" input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/func.typ --- { - "a@20..21@s0.typ": { + "a@19..20@s0.typ": { "def": { "kind": { "Var": "Variable" }, "name": "a", - "range": "20:21" + "range": "19:20" }, "refs": [ - "a@25..26" + "a@24..25" ] }, - "f@18..19@s0.typ": { + "f@17..18@s0.typ": { "def": { "kind": { "Var": "Function" }, "name": "f", - "range": "18:19" + "range": "17:18" }, "refs": [] }, diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@import.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@import.typ.snap index 8a82b888..85ec2dd1 100644 --- a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@import.typ.snap +++ b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@import.typ.snap @@ -13,7 +13,7 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/import.typ "range": "8:18" }, "refs": [ - "base@21..25" + "base@20..24" ] } } diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@redefine.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@redefine.typ.snap index bfb234bf..712a8c89 100644 --- a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@redefine.typ.snap +++ b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/def_use@redefine.typ.snap @@ -4,13 +4,13 @@ expression: "JsonRepr::new_redacted(result, &REDACT_LOC)" input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/redefine.typ --- { - "x@18..19@s0.typ": { + "x@17..18@s0.typ": { "def": { "kind": { "Var": "Variable" }, "name": "x", - "range": "18:19" + "range": "17:18" }, "refs": [] }, @@ -23,7 +23,7 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/redefine.typ "range": "5:6" }, "refs": [ - "x@22..23" + "x@21..22" ] } } diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@base.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@base.typ.snap index e10e7831..347254af 100644 --- a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@base.typ.snap +++ b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@base.typ.snap @@ -16,6 +16,6 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/base.typ "Var": "ValRef" }, "name": "x", - "range": "14:15" + "range": "13:14" } ] diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@destructing.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@destructing.typ.snap index ecf813f2..5958aa44 100644 --- a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@destructing.typ.snap +++ b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@destructing.typ.snap @@ -23,27 +23,27 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/destructing.typ "Var": "ValRef" }, "name": "b", - "range": "38:39" + "range": "37:38" }, { "kind": { "Var": "ValRef" }, "name": "a", - "range": "41:42" + "range": "40:41" }, { "kind": { "Var": "Variable" }, "name": "a", - "range": "29:30" + "range": "28:29" }, { "kind": { "Var": "Variable" }, "name": "b", - "range": "32:33" + "range": "31:32" } ] diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@dict.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@dict.typ.snap index 71622a01..ec740ec6 100644 --- a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@dict.typ.snap +++ b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@dict.typ.snap @@ -16,20 +16,20 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/dict.typ "Var": "ValRef" }, "name": "z", - "range": "30:31" + "range": "28:29" }, { "kind": { "Var": "ValRef" }, "name": "z", - "range": "43:44" + "range": "40:41" }, { "kind": { "Var": "Variable" }, "name": "x", - "range": "18:19" + "range": "17:18" } ] diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@func.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@func.typ.snap index 4683fc2e..c83e6ae4 100644 --- a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@func.typ.snap +++ b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@func.typ.snap @@ -16,7 +16,7 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/func.typ "Var": "Function" }, "name": "f", - "range": "18:19" + "range": "17:18" }, { "children": [ @@ -25,18 +25,18 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/func.typ "Var": "Variable" }, "name": "a", - "range": "20:21" + "range": "19:20" }, { "kind": { "Var": "ValRef" }, "name": "a", - "range": "25:26" + "range": "24:25" } ], "kind": "Block", "name": "", - "range": "25:26" + "range": "24:25" } ] diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@import.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@import.typ.snap index 5ca15eb3..a6b1abf1 100644 --- a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@import.typ.snap +++ b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@import.typ.snap @@ -29,6 +29,6 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/import.typ "Var": "ValRef" }, "name": "base", - "range": "21:25" + "range": "20:24" } ] diff --git a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@redefine.typ.snap b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@redefine.typ.snap index 655be13b..dd9fc37a 100644 --- a/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@redefine.typ.snap +++ b/crates/tinymist-query/src/fixtures/lexical_hierarchy/snaps/scope@redefine.typ.snap @@ -16,13 +16,13 @@ input_file: crates/tinymist-query/src/fixtures/lexical_hierarchy/redefine.typ "Var": "ValRef" }, "name": "x", - "range": "22:23" + "range": "21:22" }, { "kind": { "Var": "Variable" }, "name": "x", - "range": "18:19" + "range": "17:18" } ] diff --git a/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@content-block.typ.snap b/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@content-block.typ.snap index d3e14539..282a675d 100644 --- a/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@content-block.typ.snap +++ b/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@content-block.typ.snap @@ -3,4 +3,4 @@ source: crates/tinymist-query/src/semantic_tokens_full.rs expression: "serde_json::to_string(&result).unwrap()" input_file: crates/tinymist-query/src/fixtures/semantic_tokens/content-block.typ --- -{"data":[0,0,1,8,0,0,1,1,8,0,0,1,1,8,0,0,1,2,20,0,1,0,0,20,0,0,0,1,8,0,0,1,1,8,0,0,1,1,20,0,0,1,1,8,0,0,1,2,20,0,1,0,0,20,0,0,0,1,8,0,0,1,1,8,0,0,1,1,8,0,0,1,1,8,0,0,1,1,20,0,0,1,1,8,0,0,1,1,8,0,0,1,1,8,0,0,1,1,8,0,0,1,1,8,0,0,1,3,20,0,0,3,1,8,0,0,1,1,8,0,0,1,1,8,0]} +{"data":[0,0,1,8,0,0,1,1,8,0,0,1,1,8,0,0,1,1,20,0,1,0,0,20,0,0,0,1,8,0,0,1,1,8,0,0,1,1,20,0,0,1,1,8,0,0,1,1,20,0,1,0,0,20,0,0,0,1,8,0,0,1,1,8,0,0,1,1,8,0,0,1,1,8,0,0,1,1,20,0,0,1,1,8,0,0,1,1,8,0,0,1,1,8,0,0,1,1,8,0,0,1,1,8,0,0,1,3,20,0,0,3,1,8,0,0,1,1,8,0,0,1,1,8,0]} diff --git a/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@fn2.typ.snap b/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@fn2.typ.snap index 376ce604..00cd2615 100644 --- a/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@fn2.typ.snap +++ b/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@fn2.typ.snap @@ -3,4 +3,4 @@ source: crates/tinymist-query/src/semantic_tokens_full.rs expression: "serde_json::to_string(&result).unwrap()" input_file: crates/tinymist-query/src/fixtures/semantic_tokens/fn2.typ --- -{"data":[0,0,1,2,0,0,1,3,2,0,0,3,1,20,0,0,1,2,5,0,0,2,1,8,0,0,1,1,8,0,0,1,1,20,0,0,1,1,3,0,0,1,1,20,0,0,1,1,8,0,0,1,2,20,0,1,0,2,20,0,0,2,3,5,0,0,3,1,8,0,0,1,7,1,0,0,7,1,8,0,0,1,1,20,0,0,1,4,18,0,0,4,1,8,0,0,1,1,20,0,0,1,5,1,0,0,5,1,8,0,0,1,2,20,0,1,0,2,20,0,0,2,3,20,0,0,0,3,11,0,0,3,3,20,0,0,0,3,11,0,0,3,2,20,0,1,0,2,20,0,0,2,1,20,0,0,0,1,11,0,0,1,2,20,0,1,0,2,20,0,0,2,1,20,0,0,0,1,11,0,0,1,2,20,0,1,0,2,20,0,0,2,3,20,0,0,0,3,11,0,0,3,2,20,0,1,0,2,20,0,0,2,1,8,0,0,1,1,20,0,0,1,1,8,0,0,1,2,20,0,1,0,0,20,0,0,0,1,8,0]} +{"data":[0,0,1,2,0,0,1,3,2,0,0,3,1,20,0,0,1,2,5,0,0,2,1,8,0,0,1,1,8,0,0,1,1,20,0,0,1,1,3,0,0,1,1,20,0,0,1,1,8,0,0,1,1,20,0,1,0,2,20,0,0,2,3,5,0,0,3,1,8,0,0,1,7,1,0,0,7,1,8,0,0,1,1,20,0,0,1,4,18,0,0,4,1,8,0,0,1,1,20,0,0,1,5,1,0,0,5,1,8,0,0,1,1,20,0,1,0,2,20,0,0,2,3,20,0,0,0,3,11,0,0,3,3,20,0,0,0,3,11,0,0,3,1,20,0,1,0,2,20,0,0,2,1,20,0,0,0,1,11,0,0,1,1,20,0,1,0,2,20,0,0,2,1,20,0,0,0,1,11,0,0,1,1,20,0,1,0,2,20,0,0,2,3,20,0,0,0,3,11,0,0,3,1,20,0,1,0,2,20,0,0,2,1,8,0,0,1,1,20,0,0,1,1,8,0,0,1,1,20,0,1,0,0,20,0,0,0,1,8,0]} diff --git a/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@typst_lsp_issue_264.typ.snap b/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@typst_lsp_issue_264.typ.snap index 227dcca4..377837fe 100644 --- a/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@typst_lsp_issue_264.typ.snap +++ b/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@typst_lsp_issue_264.typ.snap @@ -3,4 +3,4 @@ source: crates/tinymist-query/src/semantic_tokens_full.rs expression: "serde_json::to_string(&result).unwrap()" input_file: crates/tinymist-query/src/fixtures/semantic_tokens/typst_lsp_issue_264.typ --- -{"data":[0,0,4,0,0,1,0,5,0,0,1,0,4,0,0,1,0,2,0,0,0,2,2,20,0,1,0,2,20,0,1,0,0,20,0,0,0,3,20,0,0,0,3,11,0,0,3,4,20,0,0,0,4,11,0,0,4,2,20,0,1,0,0,20,0,0,0,17,20,0,0,0,17,11,0,0,17,2,20,0,1,0,0,20,0,0,0,3,20,0,0,0,3,11,0]} +{"data":[0,0,3,0,0,1,0,4,0,0,1,0,3,0,0,1,0,2,0,0,0,2,1,20,0,1,0,1,20,0,1,0,0,20,0,0,0,3,20,0,0,0,3,11,0,0,3,4,20,0,0,0,4,11,0,0,4,1,20,0,1,0,0,20,0,0,0,17,20,0,0,0,17,11,0,0,17,1,20,0,1,0,0,20,0,0,0,3,20,0,0,0,3,11,0]} diff --git a/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@typst_lsp_issue_401.typ.snap b/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@typst_lsp_issue_401.typ.snap index 58d40b1d..9de3a462 100644 --- a/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@typst_lsp_issue_401.typ.snap +++ b/crates/tinymist-query/src/fixtures/semantic_tokens/snaps/test@typst_lsp_issue_401.typ.snap @@ -3,4 +3,4 @@ source: crates/tinymist-query/src/semantic_tokens_full.rs expression: "serde_json::to_string(&result).unwrap()" input_file: crates/tinymist-query/src/fixtures/semantic_tokens/typst_lsp_issue_401.typ --- -{"data":[0,0,1,1,0,0,1,7,1,0,1,0,2,1,0,1,0,6,1,0]} +{"data":[0,0,1,1,0,0,1,6,1,0,1,0,1,1,0,1,0,6,1,0]} diff --git a/crates/tinymist-query/src/tests.rs b/crates/tinymist-query/src/tests.rs index 8c4101d3..46989e5b 100644 --- a/crates/tinymist-query/src/tests.rs +++ b/crates/tinymist-query/src/tests.rs @@ -32,6 +32,8 @@ pub fn snapshot_testing(name: &str, f: &impl Fn(&mut AnalysisContext, PathBuf)) let glob_path = format!("fixtures/{name}/*.typ"); insta::glob!(&glob_path, |path| { let contents = std::fs::read_to_string(path).unwrap(); + #[cfg(windows)] + let contents = contents.replace("\r\n", "\n"); run_with_sources(&contents, |w: &mut TypstSystemWorld, p| { let paths = w