chore(grit): compact snapshot range (#3455)

biomejs · Jul 16, 2024 · 0d2af99 · 0d2af99
1 parent 0119290
commit 0d2af99
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 89 deletions.
diff --git a/crates/biome_grit_patterns/tests/spec_tests.rs b/crates/biome_grit_patterns/tests/spec_tests.rs
@@ -93,7 +93,7 @@ fn parse_test_path(file: &Path) -> (&str, &str) {
 #[derive(Debug, Default)]
 struct SnapshotResult {
     messages: Vec<Message>,
-    matched_ranges: Vec<Range>,
+    matched_ranges: Vec<String>,
     rewritten_files: Vec<OutputFile>,
     created_files: Vec<OutputFile>,
 }
@@ -105,18 +105,22 @@ impl SnapshotResult {
             match result {
                 GritQueryResult::Match(m) => {
                     snapshot_result.messages.extend(m.messages);
-                    snapshot_result.matched_ranges.extend(m.ranges);
+                    snapshot_result
+                        .matched_ranges
+                        .extend(m.ranges.into_iter().map(format_range));
                 }
                 GritQueryResult::Rewrite(rewrite) => {
                     snapshot_result.messages.extend(rewrite.original.messages);
                     snapshot_result
                         .matched_ranges
-                        .extend(rewrite.original.ranges);
+                        .extend(rewrite.original.ranges.into_iter().map(format_range));
                     snapshot_result.rewritten_files.push(rewrite.rewritten);
                 }
                 GritQueryResult::CreateFile(create_file) => {
                     if let Some(ranges) = create_file.ranges {
-                        snapshot_result.matched_ranges.extend(ranges);
+                        snapshot_result
+                            .matched_ranges
+                            .extend(ranges.into_iter().map(format_range));
                     }
                     snapshot_result.created_files.push(create_file.rewritten);
                 }
@@ -126,3 +130,10 @@ impl SnapshotResult {
         snapshot_result
     }
 }
+
+fn format_range(range: Range) -> String {
+    format!(
+        "{}:{}-{}:{}",
+        range.start.line, range.start.column, range.end.line, range.end.column
+    )
+}
diff --git a/crates/biome_grit_patterns/tests/specs/ts/arrayType.snap b/crates/biome_grit_patterns/tests/specs/ts/arrayType.snap
@@ -5,18 +5,7 @@ expression: arrayType
 SnapshotResult {
     messages: [],
     matched_ranges: [
-        Range {
-            start: Position {
-                line: 2,
-                column: 22,
-            },
-            end: Position {
-                line: 2,
-                column: 30,
-            },
-            start_byte: 22,
-            end_byte: 30,
-        },
+        "2:22-2:30",
     ],
     rewritten_files: [],
     created_files: [],

diff --git a/crates/biome_grit_patterns/tests/specs/ts/identifier.snap b/crates/biome_grit_patterns/tests/specs/ts/identifier.snap
@@ -5,42 +5,9 @@ expression: identifier
 SnapshotResult {
     messages: [],
     matched_ranges: [
-        Range {
-            start: Position {
-                line: 3,
-                column: 8,
-            },
-            end: Position {
-                line: 3,
-                column: 11,
-            },
-            start_byte: 25,
-            end_byte: 28,
-        },
-        Range {
-            start: Position {
-                line: 6,
-                column: 3,
-            },
-            end: Position {
-                line: 6,
-                column: 6,
-            },
-            start_byte: 52,
-            end_byte: 55,
-        },
-        Range {
-            start: Position {
-                line: 11,
-                column: 2,
-            },
-            end: Position {
-                line: 11,
-                column: 5,
-            },
-            start_byte: 99,
-            end_byte: 102,
-        },
+        "3:8-3:11",
+        "6:3-6:6",
+        "11:2-11:5",
     ],
     rewritten_files: [],
     created_files: [],

diff --git a/crates/biome_grit_patterns/tests/specs/ts/invalidSnippet.grit b/crates/biome_grit_patterns/tests/specs/ts/invalidSnippet.grit
@@ -0,0 +1 @@
+`"`
diff --git a/crates/biome_grit_patterns/tests/specs/ts/invalidSnippet.snap b/crates/biome_grit_patterns/tests/specs/ts/invalidSnippet.snap
@@ -0,0 +1,10 @@
+---
+source: crates/biome_grit_patterns/tests/spec_tests.rs
+expression: invalidSnippet
+---
+SnapshotResult {
+    messages: [],
+    matched_ranges: [],
+    rewritten_files: [],
+    created_files: [],
+}
diff --git a/crates/biome_grit_patterns/tests/specs/ts/invalidSnippet.ts b/crates/biome_grit_patterns/tests/specs/ts/invalidSnippet.ts
@@ -0,0 +1,2 @@
+
+// Not going to match anything.
diff --git a/crates/biome_grit_patterns/tests/specs/ts/objectLiteral.snap b/crates/biome_grit_patterns/tests/specs/ts/objectLiteral.snap
@@ -5,18 +5,7 @@ expression: objectLiteral
 SnapshotResult {
     messages: [],
     matched_ranges: [
-        Range {
-            start: Position {
-                line: 3,
-                column: 15,
-            },
-            end: Position {
-                line: 6,
-                column: 6,
-            },
-            start_byte: 42,
-            end_byte: 85,
-        },
+        "3:15-6:6",
     ],
     rewritten_files: [],
     created_files: [],

diff --git a/crates/biome_grit_patterns/tests/specs/ts/strings.snap b/crates/biome_grit_patterns/tests/specs/ts/strings.snap
@@ -5,30 +5,8 @@ expression: strings
 SnapshotResult {
     messages: [],
     matched_ranges: [
-        Range {
-            start: Position {
-                line: 2,
-                column: 11,
-            },
-            end: Position {
-                line: 2,
-                column: 16,
-            },
-            start_byte: 11,
-            end_byte: 16,
-        },
-        Range {
-            start: Position {
-                line: 3,
-                column: 11,
-            },
-            end: Position {
-                line: 3,
-                column: 16,
-            },
-            start_byte: 28,
-            end_byte: 33,
-        },
+        "2:11-2:16",
+        "3:11-3:16",
     ],
     rewritten_files: [],
     created_files: [],

diff --git a/crates/biome_grit_patterns/tests/specs/ts/strings.ts b/crates/biome_grit_patterns/tests/specs/ts/strings.ts
@@ -1,4 +1,4 @@
 
 const a = 'foo';
 const b = "foo";
-const c = `foo`;
+const c = `foo`; // Template strings do not get matched with regular ones.