ripgrep alignment

Author: cramforce

src/commands/rg/imported-tests/binary.test.ts

@@ -27,7 +27,6 @@ describe("rg binary: basic detection", () => {
     expect(result.exitCode).toBe(0);
     // Should only find match in text file, not binary
     expect(result.stdout).toBe("text.txt:1:hello world\n");
-    expect(result.stdout).not.toContain("binary.bin");
   });
 
   it("should skip binary files when searching single explicit file", async () => {
@@ -64,7 +63,7 @@ describe("rg binary: basic detection", () => {
     });
     const result = await bash.exec("rg pattern");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("pattern");
+    expect(result.stdout).toBe("late.txt:1:pattern\n");
   });
 });
 
@@ -108,11 +107,11 @@ describe("rg binary: mixed content", () => {
         "/home/user/script.sh": "echo documentation\n",
       },
     });
-    const result = await bash.exec("rg documentation");
+    const result = await bash.exec("rg --sort path documentation");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("readme.md");
-    expect(result.stdout).toContain("script.sh");
-    expect(result.stdout).not.toContain("image.png");
+    expect(result.stdout).toBe(
+      "readme.md:1:documentation\nscript.sh:1:echo documentation\n",
+    );
   });
 
   it("should handle multiple binary and text files", async () => {
@@ -248,10 +247,7 @@ describe("rg binary: with other flags", () => {
     });
     const result = await bash.exec("rg -C1 match");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("before");
-    expect(result.stdout).toContain("match");
-    expect(result.stdout).toContain("after");
-    expect(result.stdout).not.toContain("binary.bin");
+    expect(result.stdout).toBe("text.txt-1-before\ntext.txt:2:match\ntext.txt-3-after\n");
   });
 
   it("should work with -m flag", async () => {
@@ -278,10 +274,10 @@ describe("rg binary: subdirectories", () => {
         "/home/user/lib/util.ts": "export function foo() {}\n",
       },
     });
-    const result = await bash.exec("rg export");
+    const result = await bash.exec("rg --sort path export");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("src/code.ts");
-    expect(result.stdout).toContain("lib/util.ts");
-    expect(result.stdout).not.toContain("assets/image.bin");
+    expect(result.stdout).toBe(
+      "lib/util.ts:1:export function foo() {}\nsrc/code.ts:1:export const x = 1;\n",
+    );
   });
 });

src/commands/rg/imported-tests/feature.test.ts

@@ -263,8 +263,7 @@ describe("rg feature: multiple patterns", () => {
     });
     const result = await bash.exec("rg -e foo -e bar");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("foo");
-    expect(result.stdout).toContain("bar");
+    expect(result.stdout).toBe("file:1:foo\nfile:2:bar\n");
   });
 });
 
@@ -292,10 +291,9 @@ describe("rg feature: gitignore handling", () => {
         "/home/user/ignored.txt": "test\n",
       },
     });
-    const result = await bash.exec("rg --no-ignore test");
+    const result = await bash.exec("rg --no-ignore --sort path test");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("visible.txt");
-    expect(result.stdout).toContain("ignored.txt");
+    expect(result.stdout).toBe("ignored.txt:1:test\nvisible.txt:1:test\n");
   });
 });
 
@@ -321,10 +319,9 @@ describe("rg feature: hidden files", () => {
         "/home/user/visible": "test\n",
       },
     });
-    const result = await bash.exec("rg --hidden test");
+    const result = await bash.exec("rg --hidden --sort path test");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain(".hidden");
-    expect(result.stdout).toContain("visible");
+    expect(result.stdout).toBe(".hidden:1:test\nvisible:1:test\n");
   });
 });
 
@@ -550,7 +547,7 @@ describe("rg feature: combined flags", () => {
     });
     const result = await bash.exec("rg -iw foo");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("FOO");
+    expect(result.stdout).toBe("file:1:FOO foobar\n");
   });
 
   it("should combine -c and -i", async () => {

src/commands/rg/imported-tests/regression.test.ts

@@ -377,10 +377,9 @@ describe("rg regression: issue #693 - context in count mode", () => {
         "/home/user/foo": "xyz\n",
       },
     });
-    const result = await bash.exec("rg -C1 -c xyz");
+    const result = await bash.exec("rg -C1 -c --sort path xyz");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("bar:1");
-    expect(result.stdout).toContain("foo:1");
+    expect(result.stdout).toBe("bar:1\nfoo:1\n");
   });
 });
 
@@ -410,9 +409,7 @@ describe("rg regression: misc patterns", () => {
     });
     const result = await bash.exec("rg '[a-z]+@[a-z]+\\.[a-z]+' email.txt");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("test@example.com");
-    expect(result.stdout).toContain("foo@bar.org");
-    expect(result.stdout).not.toContain("invalid\n");
+    expect(result.stdout).toBe("test@example.com\nfoo@bar.org\n");
   });
 
   it("should match multiple patterns on same line", async () => {
@@ -450,7 +447,6 @@ describe("rg regression: edge cases", () => {
     });
     const result = await bash.exec("rg -e foo -e bar");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("foo");
-    expect(result.stdout).toContain("bar");
+    expect(result.stdout).toBe("file:1:foo\nfile:2:bar\n");
   });
 });

src/commands/rg/rg-search.ts

@@ -547,6 +547,7 @@ async function searchFiles(
           maxCount: options.maxCount,
           contextSeparator: options.contextSeparator,
           showColumn: options.column,
+          vimgrep: options.vimgrep,
           showByteOffset: options.byteOffset,
           replace: options.replace,
           passthru: options.passthru,

src/commands/rg/rg.flags.test.ts

@@ -44,7 +44,6 @@ describe("rg -L (follow symlinks)", () => {
     const result = await bash.exec("rg hello");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("real.txt:1:hello\n");
-    expect(result.stdout).not.toContain("link.txt");
   });
 
   it("should follow symlinks with -L in directory search", async () => {
@@ -56,10 +55,9 @@ describe("rg -L (follow symlinks)", () => {
     });
     await bash.exec("ln -s real.txt /home/user/link.txt");
 
-    const result = await bash.exec("rg -L hello");
+    const result = await bash.exec("rg -L --sort path hello");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("real.txt");
-    expect(result.stdout).toContain("link.txt");
+    expect(result.stdout).toBe("link.txt:1:hello\nreal.txt:1:hello\n");
   });
 
   it("should follow symlinks to directories with -L", async () => {
@@ -77,10 +75,11 @@ describe("rg -L (follow symlinks)", () => {
     expect(result.stdout).toBe("subdir/file.txt:1:hello\n");
 
     // With -L, should find file through both paths
-    result = await bash.exec("rg -L hello");
+    result = await bash.exec("rg -L --sort path hello");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("subdir/file.txt");
-    expect(result.stdout).toContain("linkdir/file.txt");
+    expect(result.stdout).toBe(
+      "linkdir/file.txt:1:hello\nsubdir/file.txt:1:hello\n",
+    );
   });
 });
 
@@ -99,9 +98,8 @@ describe("rg -u (unrestricted)", () => {
     expect(result.stdout).toBe("visible.txt:1:hello\n");
 
     // With -u, ignored.txt should be searched
-    result = await bash.exec("rg -u hello");
-    expect(result.stdout).toContain("ignored.txt");
-    expect(result.stdout).toContain("visible.txt");
+    result = await bash.exec("rg -u --sort path hello");
+    expect(result.stdout).toBe("ignored.txt:1:hello\nvisible.txt:1:hello\n");
   });
 
   it("should search hidden files with -uu", async () => {
@@ -117,9 +115,8 @@ describe("rg -u (unrestricted)", () => {
     expect(result.stdout).toBe("visible.txt:1:hello\n");
 
     // With -uu (--no-ignore --hidden), .hidden should be searched
-    result = await bash.exec("rg -uu hello");
-    expect(result.stdout).toContain(".hidden");
-    expect(result.stdout).toContain("visible.txt");
+    result = await bash.exec("rg -uu --sort path hello");
+    expect(result.stdout).toBe(".hidden:1:hello\nvisible.txt:1:hello\n");
   });
 
   it("-u should be equivalent to --no-ignore", async () => {
@@ -164,6 +161,6 @@ describe("rg -a (text/binary)", () => {
     // With -a, binary should be searched
     result = await bash.exec("rg -a hello");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("binary.bin");
+    expect(result.stdout).toBe("binary.bin:1:hello\x00world\n");
   });
 });

src/commands/rg/rg.no-filename.test.ts

@@ -17,7 +17,6 @@ describe("rg -I/--no-filename basic functionality", () => {
     const result = await bash.exec("rg -I hello");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("1:hello world\n");
-    expect(result.stdout).not.toContain("file.txt");
   });
 
   it("should hide filename with --no-filename in directory search", async () => {
@@ -30,7 +29,6 @@ describe("rg -I/--no-filename basic functionality", () => {
     const result = await bash.exec("rg --no-filename test");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("1:test line\n");
-    expect(result.stdout).not.toContain("data.txt");
   });
 
   it("should work without line numbers when combined with -N", async () => {
@@ -56,7 +54,6 @@ describe("rg -I/--no-filename basic functionality", () => {
     const result = await bash.exec("rg -I foo test.txt");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("foo bar\n");
-    expect(result.stdout).not.toContain("test.txt");
   });
 });
 
@@ -73,9 +70,6 @@ describe("rg -I with multiple files", () => {
     const result = await bash.exec("rg -I found");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("1:found\n1:found\n1:found\n");
-    expect(result.stdout).not.toContain("a.txt");
-    expect(result.stdout).not.toContain("b.txt");
-    expect(result.stdout).not.toContain("c.txt");
   });
 
   it("should still show line numbers with multiple files", async () => {
@@ -86,12 +80,9 @@ describe("rg -I with multiple files", () => {
         "/home/user/second.txt": "line three\n",
       },
     });
-    const result = await bash.exec("rg -I line");
+    const result = await bash.exec("rg -I --sort path line");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).toContain("1:");
-    expect(result.stdout).toContain("2:");
-    expect(result.stdout).not.toContain("first.txt");
-    expect(result.stdout).not.toContain("second.txt");
+    expect(result.stdout).toBe("1:line one\n2:line two\n1:line three\n");
   });
 
   it("should hide filenames in subdirectories", async () => {
@@ -107,10 +98,6 @@ describe("rg -I with multiple files", () => {
     expect(result.stdout).toBe(
       "1:export const y = 2;\n1:export const x = 1;\n",
     );
-    expect(result.stdout).not.toContain("app.ts");
-    expect(result.stdout).not.toContain("util.ts");
-    expect(result.stdout).not.toContain("src/");
-    expect(result.stdout).not.toContain("lib/");
   });
 });
 
@@ -139,8 +126,6 @@ describe("rg -I with other flags", () => {
     const result = await bash.exec("rg -I -c x");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("2\n3\n");
-    expect(result.stdout).not.toContain("a.txt");
-    expect(result.stdout).not.toContain("b.txt");
   });
 
   it("should work with -o (only matching)", async () => {
@@ -153,7 +138,6 @@ describe("rg -I with other flags", () => {
     const result = await bash.exec("rg -I -o '[0-9]+'");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("123\n456\n");
-    expect(result.stdout).not.toContain("nums.txt");
   });
 
   it("should work with -v (invert match)", async () => {
@@ -166,7 +150,6 @@ describe("rg -I with other flags", () => {
     const result = await bash.exec("rg -I -v remove");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("1:keep\n3:keep\n");
-    expect(result.stdout).not.toContain("file.txt");
   });
 
   it("should work with -i (case insensitive)", async () => {
@@ -179,7 +162,6 @@ describe("rg -I with other flags", () => {
     const result = await bash.exec("rg -I -i hello");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("1:Hello\n2:HELLO\n3:hello\n");
-    expect(result.stdout).not.toContain("file.txt");
   });
 
   it("should work with -w (word match)", async () => {
@@ -192,7 +174,6 @@ describe("rg -I with other flags", () => {
     const result = await bash.exec("rg -I -w foo");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("1:foo bar\n3:bar foo baz\n");
-    expect(result.stdout).not.toContain("file.txt");
   });
 
   it("should work with -m (max count)", async () => {
@@ -205,7 +186,6 @@ describe("rg -I with other flags", () => {
     const result = await bash.exec("rg -I -m2 test");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("1:test\n2:test\n");
-    expect(result.stdout).not.toContain("file.txt");
   });
 
   it("should NOT affect -l (files with matches)", async () => {
@@ -249,7 +229,6 @@ describe("rg -I with context lines", () => {
     const result = await bash.exec("rg -I -A1 match");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("2:match\n3-after\n");
-    expect(result.stdout).not.toContain("file.txt");
   });
 
   it("should hide filename with -B (before context)", async () => {
@@ -262,7 +241,6 @@ describe("rg -I with context lines", () => {
     const result = await bash.exec("rg -I -B1 match");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("1-before\n2:match\n");
-    expect(result.stdout).not.toContain("file.txt");
   });
 
   it("should hide filename with -C (context)", async () => {
@@ -275,7 +253,6 @@ describe("rg -I with context lines", () => {
     const result = await bash.exec("rg -I -C1 match");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("2-b\n3:match\n4-c\n");
-    expect(result.stdout).not.toContain("file.txt");
   });
 
   it("should hide filename in context across multiple files", async () => {
@@ -286,11 +263,12 @@ describe("rg -I with context lines", () => {
         "/home/user/b.txt": "ctx\nmatch\nctx\n",
       },
     });
-    const result = await bash.exec("rg -I -C1 match");
+    const result = await bash.exec("rg -I -C1 --sort path match");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout).not.toContain("a.txt");
-    expect(result.stdout).not.toContain("b.txt");
-    expect(result.stdout).toContain("match");
+    // No separator between files when -I is used since there's no filename prefix
+    expect(result.stdout).toBe(
+      "1-ctx\n2:match\n3-ctx\n1-ctx\n2:match\n3-ctx\n",
+    );
   });
 });
 
@@ -306,7 +284,6 @@ describe("rg -I with file filters", () => {
     const result = await bash.exec("rg -I -t js const");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("1:const x = 1;\n");
-    expect(result.stdout).not.toContain("code.js");
   });
 
   it("should work with -g (glob filter)", async () => {
@@ -320,7 +297,6 @@ describe("rg -I with file filters", () => {
     const result = await bash.exec("rg -I -g '*.log' error");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("1:error occurred\n");
-    expect(result.stdout).not.toContain("test.log");
   });
 });
 
@@ -359,7 +335,6 @@ describe("rg -I edge cases", () => {
     const result = await bash.exec("rg -I --hidden secret");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("1:secret\n");
-    expect(result.stdout).not.toContain(".hidden");
   });
 
   it("should work combined with other short flags", async () => {
@@ -373,7 +348,6 @@ describe("rg -I edge cases", () => {
     const result = await bash.exec("rg -Iin test");
     expect(result.exitCode).toBe(0);
     expect(result.stdout).toBe("1:Test\n2:test\n3:TEST\n");
-    expect(result.stdout).not.toContain("file.txt");
   });
 
   it("should output just line numbers with -In", async () => {