@cueloop/client 0.1.0-alpha.91 → 0.1.0-alpha.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cueloop/client",
-  "version": "0.1.0-alpha.91",
+  "version": "0.1.0-alpha.92",
   "description": "The cueloop review UI: projection renderer, keyboard grammar, review rail",
   "homepage": "https://github.com/mmurakaru/cueloop#readme",
   "bugs": {
@@ -27,10 +27,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@cueloop/daemon": "0.1.0-alpha.91",
-    "@cueloop/extension-api": "0.1.0-alpha.91",
-    "@cueloop/integration-obsidian": "0.1.0-alpha.91",
-    "@cueloop/schema": "0.1.0-alpha.91",
+    "@cueloop/daemon": "0.1.0-alpha.92",
+    "@cueloop/extension-api": "0.1.0-alpha.92",
+    "@cueloop/integration-obsidian": "0.1.0-alpha.92",
+    "@cueloop/schema": "0.1.0-alpha.92",
     "@opentui/core": "^0.5.11",
     "@opentui/keymap": "0.5.11",
     "@opentui/react": "^0.5.11",

package/src/components/AnnotatableFileView.test.tsx

@@ -4,12 +4,13 @@
  */
 
 import { describe, expect, mock, test } from "bun:test";
+import type { RGBA } from "@opentui/core";
 import { testRender } from "@opentui/react/test-utils";
 import React from "react";
 import { SCHEMA_VERSION, type Anchor, type Thread } from "@cueloop/schema";
 import { AnnotatableFileView } from "./AnnotatableFileView";
 import { DARK } from "../theme";
-import { dragText, typeText, pressKey, waitForText } from "../test-support";
+import { allowEventLoopUpdates, dragText, typeText, pressKey, waitForText } from "../test-support";
 
 const SAMPLE = "export function add(a: number, b: number) {\n  return a + b;\n}\n";
 
@@ -29,7 +30,53 @@ function planSession(): Thread {
 
 const noop = (): void => {};
 
+function colorHex(color: RGBA): string {
+  const [red, green, blue] = color.toInts();
+
+  return "#" + [red, green, blue].map((part) => part.toString(16).padStart(2, "0")).join("");
+}
+
 describe("AnnotatableFileView", () => {
+  for (const { path, source, keyword } of [
+    { path: "src/add.ts", source: "export const add = 1;", keyword: "export" },
+    { path: "src/add.js", source: "const add = 1;", keyword: "const" },
+  ]) {
+    test(`highlights ${path} by its detected language`, async () => {
+      allowEventLoopUpdates();
+      const setup = await testRender(
+        <AnnotatableFileView
+          path={path}
+          loadContents={() => Promise.resolve(source)}
+          session={planSession()}
+          quickActions={[]}
+          observer={false}
+          onAddComment={noop}
+          onReply={noop}
+          onUpdateAnnotation={noop}
+          onExit={noop}
+          theme={DARK}
+        />,
+        { width: 64, height: 12 },
+      );
+      let highlighted = false;
+
+      for (let attempt = 0; attempt < 60 && !highlighted; attempt++) {
+        await setup.renderOnce();
+        await new Promise((resolve) => setTimeout(resolve, 20));
+        highlighted = setup.captureSpans().lines.some((line) =>
+          line.spans
+            .filter((span) => colorHex(span.fg) === DARK.accent)
+            .map((span) => span.text)
+            .join("")
+            .includes(keyword),
+        );
+      }
+
+      expect(highlighted).toBe(true);
+      setup.renderer.destroy();
+    }, 25000);
+  }
+
   test("commenting a file line hands up an anchor that quotes the line", async () => {
     const onAddComment = mock((_anchor: Anchor, _body: string) => {});
     const setup = await testRender(

package/src/diff-syntax.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 import { highlightJobs, spansByLine } from "./diff-syntax";
-import type { DiffRow } from "./view-diff";
+import { fileContentsRows, type DiffRow } from "./view-diff";
 import type { SimpleHighlight } from "@opentui/core";
 
 function row(kind: DiffRow["kind"], text: string, file = "src/x.ts"): DiffRow {
@@ -74,6 +74,19 @@ describe("spansByLine", () => {
 });
 
 describe("highlightJobs", () => {
+  for (const { path, filetype } of [
+    { path: "src/add.ts", filetype: "typescript" },
+    { path: "src/add.py", filetype: "python" },
+    { path: "config.json", filetype: "json" },
+  ]) {
+    test(`detects ${filetype} in a plain project file without a diff header`, () => {
+      const source = "first line\nsecond line";
+      const rows = fileContentsRows(path, source);
+
+      expect(highlightJobs(rows)).toEqual([{ filetype, source, rowIndexByLine: [0, 1] }]);
+    });
+  }
+
   test("reconstructs old and new sides of a hunk with row indices", () => {
     // Arrange
     const rows = [
@@ -100,7 +113,7 @@ describe("highlightJobs", () => {
     const rows = [
       row("file", "notes/thing.unknownext", "notes/thing.unknownext"),
       row("hunk", "@@"),
-      row("add", "whatever"),
+      row("add", "whatever", "notes/thing.unknownext"),
     ];
 
     // Act

package/src/diff-syntax.ts

@@ -31,9 +31,8 @@ interface HighlightJob {
 }
 
 /**
- * Split diff rows into per-hunk highlight jobs, one per side. A hunk's rows are
- * contiguous file lines, so each side reconstructs to valid code; file/hunk
- * header rows and files without a known filetype are skipped.
+ * Split diff rows into per-hunk highlight jobs, one per side. Plain project
+ * files contain only context rows, so detect their language from the row path.
  */
 export function highlightJobs(rows: DiffRow[]): HighlightJob[] {
   const jobs: HighlightJob[] = [];
@@ -42,10 +41,12 @@ export function highlightJobs(rows: DiffRow[]): HighlightJob[] {
   let oldRowIndexByLine: number[] = [];
   let newRowIndexByLine: number[] = [];
   let filetype: string | undefined;
+  let path: string | undefined;
+  let hasChange = false;
 
   const flush = (): void => {
     if (filetype) {
-      if (oldLines.length)
+      if (oldLines.length && (hasChange || newLines.length === 0))
         jobs.push({ filetype, source: oldLines.join("\n"), rowIndexByLine: oldRowIndexByLine });
       if (newLines.length)
         jobs.push({ filetype, source: newLines.join("\n"), rowIndexByLine: newRowIndexByLine });
@@ -54,14 +55,20 @@ export function highlightJobs(rows: DiffRow[]): HighlightJob[] {
     newLines = [];
     oldRowIndexByLine = [];
     newRowIndexByLine = [];
+    hasChange = false;
   };
 
   for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
     const row = rows[rowIndex]!;
 
+    if (row.file !== path) {
+      flush();
+      path = row.file;
+      filetype = filetypeForPath(path);
+    }
+
     if (row.kind === "file" || row.kind === "hunk") {
       flush();
-      filetype = row.kind === "file" ? filetypeForPath(row.file) : filetype;
       continue;
     }
     const text = stripTrailingNewline(row.text);
@@ -74,6 +81,7 @@ export function highlightJobs(rows: DiffRow[]): HighlightJob[] {
       newLines.push(text);
       newRowIndexByLine.push(rowIndex);
     }
+    if (row.kind === "add" || row.kind === "del") hasChange = true;
   }
   flush();