dofs: Mark matching grep context lines

Author: aron-cf

packages/dofs/src/fs/grep.test.ts

@@ -90,6 +90,41 @@ describe("grep", () => {
     });
   });
 
+  it("marks adjacent matches as matching context", async () => {
+    await withDB(async (db) => {
+      await writeFile(db, "/a.txt", "TODO one\nTODO two\nplain\n", {}, () => 0);
+
+      const matches = await grep(db, "TODO", "/a.txt", { contextLines: 1 });
+      expect(matches).toEqual([
+        {
+          path: "/a.txt",
+          line: 1,
+          text: "TODO one",
+          context: [
+            { line: 1, text: "TODO one", isMatch: true },
+            { line: 2, text: "TODO two", isMatch: true },
+          ],
+        },
+        {
+          path: "/a.txt",
+          line: 2,
+          text: "TODO two",
+          context: [
+            { line: 1, text: "TODO one", isMatch: true },
+            { line: 2, text: "TODO two", isMatch: true },
+            { line: 3, text: "plain", isMatch: false },
+          ],
+        },
+      ]);
+
+      if (matches[0].context === undefined || matches[1].context === undefined) {
+        throw new Error("expected grep context");
+      }
+      matches[0].context[0].text = "changed";
+      expect(matches[1].context[0].text).toBe("TODO one");
+    });
+  });
+
   it("applies offset and limit across files in path and line order", async () => {
     await withDB(async (db) => {
       await writeFile(db, "/a.txt", "TODO a1\nTODO a2\n", {}, () => 0);

packages/dofs/src/fs/grep.ts

@@ -145,27 +145,26 @@ async function scanFile(
   state: ScanState,
   out: WorkspaceGrepMatch[],
 ): Promise<boolean> {
-  const before: NumberedLine[] = [];
+  const before: WorkspaceGrepContextLine[] = [];
   const pending: PendingMatch[] = [];
 
   for await (const current of readLines(db, path)) {
+    const isMatch = matcher.test(current.text);
+    const contextLine = { ...current, isMatch };
     for (const item of pending) {
-      item.match.context?.push({ ...current, isMatch: false });
+      item.match.context?.push({ ...contextLine });
       item.remaining -= 1;
     }
     flushReady(pending, out);
     if (state.accepted >= limit && pending.length === 0) return true;
 
-    if (matcher.test(current.text)) {
+    if (isMatch) {
       const matchIndex = state.seen;
       state.seen += 1;
       if (matchIndex >= offset && state.accepted < limit) {
-        const match: WorkspaceGrepMatch = { path, ...current };
+        const match: WorkspaceGrepMatch = { path, line: current.line, text: current.text };
         if (contextLines > 0) {
-          match.context = [
-            ...before.map((line) => ({ ...line, isMatch: false })),
-            { ...current, isMatch: true },
-          ];
+          match.context = [...before.map((line) => ({ ...line })), { ...contextLine }];
           pending.push({ match, remaining: contextLines });
         } else {
           out.push(match);
@@ -174,7 +173,7 @@ async function scanFile(
       }
     }
 
-    before.push(current);
+    before.push(contextLine);
     if (before.length > contextLines) before.shift();
     if (state.accepted >= limit && pending.length === 0) return true;
   }