fix: process overlapping cases in line folding only mode (3ab4fa6) (#588

) * fix: process overlapping cases in line folding only mode (3ab4fa6) * fix: snapshot
Myriad-Dreamin · Sep 7, 2024 · 50fadf4 · 50fadf4
1 parent 3ab4fa6
commit 50fadf4
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 1 deletion.
diff --git a/crates/tinymist-query/src/fixtures/folding_range/nested-blocks-2.typ b/crates/tinymist-query/src/fixtures/folding_range/nested-blocks-2.typ
@@ -0,0 +1,7 @@
+#let slides(..args) = args
+#slides[
+
+  = Heading
+][
+
+]
diff --git a/crates/tinymist-query/src/fixtures/folding_range/snaps/test@nested-blocks-2.typ.snap b/crates/tinymist-query/src/fixtures/folding_range/snaps/test@nested-blocks-2.typ.snap
@@ -0,0 +1,54 @@
+---
+source: crates/tinymist-query/src/folding_range.rs
+expression: "JsonRepr::new_pure(json!({ \"false\": result_false, \"true\": result_true, }))"
+input_file: crates/tinymist-query/src/fixtures/folding_range/nested-blocks-2.typ
+---
+{
+ "false": [
+  {
+   "collapsedText": "Heading",
+   "endCharacter": 11,
+   "endLine": 4,
+   "startCharacter": 4,
+   "startLine": 3
+  },
+  {
+   "collapsedText": "",
+   "endCharacter": 1,
+   "endLine": 4,
+   "startCharacter": 7,
+   "startLine": 1
+  },
+  {
+   "collapsedText": "",
+   "endCharacter": 1,
+   "endLine": 6,
+   "startCharacter": 1,
+   "startLine": 4
+  },
+  {
+   "collapsedText": "",
+   "endCharacter": 1,
+   "endLine": 6,
+   "startCharacter": 7,
+   "startLine": 1
+  }
+ ],
+ "true": [
+  {
+   "collapsedText": "",
+   "endLine": 3,
+   "startLine": 2
+  },
+  {
+   "collapsedText": "",
+   "endLine": 6,
+   "startLine": 4
+  },
+  {
+   "collapsedText": "",
+   "endLine": 6,
+   "startLine": 1
+  }
+ ]
+}
diff --git a/tests/e2e/main.rs b/tests/e2e/main.rs
@@ -385,7 +385,7 @@ fn e2e() {
         });
 
         let hash = replay_log(&tinymist_binary, &root.join("vscode"));
-        insta::assert_snapshot!(hash, @"siphash128_13:5e46fecd62a56ad654d933738ef4b753");
+        insta::assert_snapshot!(hash, @"siphash128_13:6b2341befebb4a33dc86f0d934aa43");
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -385,7 +385,7 @@ fn e2e() { @@
             });
             let hash = replay_log(&tinymist_binary, &root.join("vscode"));
-            insta::assert_snapshot!(hash, @"siphash128_13:5e46fecd62a56ad654d933738ef4b753");
+            insta::assert_snapshot!(hash, @"siphash128_13:6b2341befebb4a33dc86f0d934aa43");
         }
     }
@@ Expand Down @@