Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/odin-highlighting.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"hunkdiff": patch
---

Highlight Odin source files in diff views.
19 changes: 17 additions & 2 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
},
"dependencies": {
"@pierre/diffs": "1.2.2",
"@shikijs/langs": "4.0.2",
"bun": "^1.3.14",
"commander": "^14.0.3",
"diff": "^8.0.3",
Expand Down
5 changes: 5 additions & 0 deletions src/core/fileLanguage.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ describe("custom file language registration", () => {
expect(getFiletypeFromFileName("src/nested/foo.mts")).toBe("typescript");
});

test("maps Odin source files to odin", () => {
expect(getFiletypeFromFileName("main.odin")).toBe("odin");
expect(getFiletypeFromFileName("src/nested/main.odin")).toBe("odin");
});

test("preserves Pierre's built-in extension detection", () => {
expect(getFiletypeFromFileName("foo.ts")).toBe("typescript");
expect(getFiletypeFromFileName("foo.tsx")).toBe("tsx");
Expand Down
6 changes: 5 additions & 1 deletion src/core/fileLanguage.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import {
getFiletypeFromFileName,
registerCustomLanguage,
setCustomExtension,
type SupportedLanguages,
} from "@pierre/diffs";

// Pierre omits these TypeScript extensions, so register them before lookups or rendering.
// Shiki 3 does not bundle Odin, so load its current TextMate grammar through Pierre's custom path.
registerCustomLanguage("odin", () => import("@shikijs/langs/odin"), ["odin"]);

// Register extensions Pierre omits before performing language lookups or rendering.
const HUNK_CUSTOM_EXTENSIONS: Record<string, SupportedLanguages> = {
mts: "typescript",
cts: "typescript",
Expand Down
38 changes: 38 additions & 0 deletions src/ui/diff/pierre.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { describe, expect, test } from "bun:test";
import { parseDiffFromFile } from "@pierre/diffs";
import "../../core/fileLanguage";
import type { DiffFile } from "../../core/types";
import {
buildSplitRows,
Expand Down Expand Up @@ -675,6 +676,43 @@ describe("Pierre diff rows", () => {
}
});

test("highlights Odin source with the registered custom grammar", async () => {
const metadata = parseDiffFromFile(
{
name: "main.odin",
contents: "package main\nmain :: proc() {}\n",
cacheKey: "odin-before",
},
{
name: "main.odin",
contents: 'package main\nmain :: proc() {\n message := "hello"\n}\n',
cacheKey: "odin-after",
},
{ context: 3 },
true,
);
const file: DiffFile = {
id: "odin-syntax",
path: "main.odin",
patch: "",
language: "odin",
stats: { additions: 2, deletions: 1 },
metadata,
agent: null,
};
const theme = resolveTheme("github-dark-default", null);
const highlighted = await loadHighlightedDiff(file, theme);
const spans = buildStackRows(file, highlighted, theme)
.filter(
(row): row is Extract<DiffRow, { type: "stack-line" }> =>
row.type === "stack-line" && row.cell.kind === "addition",
)
.flatMap((row) => row.cell.spans);

expect(spans.find((span) => span.text === " :: proc")?.fg).toBeDefined();
expect(spans.find((span) => span.text.includes('"hello"'))?.fg).toBeDefined();
});

test("uses Shiki's bundled Catppuccin theme for Catppuccin syntax", async () => {
const metadata = parseDiffFromFile(
{ name: "syntax.ts", contents: "const a = 1;\n", cacheKey: "catppuccin-before" },
Expand Down