From 68fb4d9a10c211c54b761598a45549302178d59b Mon Sep 17 00:00:00 2001 From: Elliot DeNolf Date: Wed, 7 Oct 2026 21:47:48 -0400 Subject: [PATCH] feat(highlight): add diff/patch syntax highlighting Bundle the tree-sitter-diff v0.2.0 grammar with `patch` as an alias and style added/removed/changed lines green/red/yellow. The vendored highlights.scm drops the line markers (+ - < > !) from the punctuation.special capture: OpenTUI ignores `priority`, so that capture overrode the line color on the marker. parsers-config.json points at the local query so update-parsers keeps the edit. --- assets/parsers/diff/highlights.scm | 72 ++++++++++++++++++++++ assets/parsers/diff/tree-sitter-diff.wasm | Bin 0 -> 58931 bytes parsers-config.json | 8 +++ src/app/lib/renderAnsi.test.ts | 15 +++++ src/app/parsers.ts | 3 + src/app/styles/syntax-style.ts | 4 ++ test/lang-parsers.md | 14 +++++ 7 files changed, 116 insertions(+) create mode 100644 assets/parsers/diff/highlights.scm create mode 100644 assets/parsers/diff/tree-sitter-diff.wasm diff --git a/assets/parsers/diff/highlights.scm b/assets/parsers/diff/highlights.scm new file mode 100644 index 0000000..40464db --- /dev/null +++ b/assets/parsers/diff/highlights.scm @@ -0,0 +1,72 @@ +(comment) @comment @spell + +[ + (addition) + (new_file) +] @diff.plus + +[ + (deletion) + (old_file) +] @diff.minus + +(change) @diff.delta + +(commit) @constant + +(location) @attribute + +(command + "diff" @function + (argument) @variable.parameter) + +(filename) @string.special.path + +(special) @string.special + +"\\" @punctuation.special + +(mode) @number + +; Line markers (+ - < > !) carry no capture of their own, so they inherit the +; line's diff.plus/diff.minus color. OpenTUI ignores `priority` and would let a +; punctuation capture override the line color. +".." @punctuation.special + +[ + (binary_change) + (similarity) + (dissimilarity) + (file_change) +] @label + +(index + "index" @keyword) + +(similarity + (score) @number + "%" @number) + +(dissimilarity + (score) @number + "%" @number) + +(binary_patch + [ + "GIT" + "binary" + "patch" + ] @label) + +(binary_hunk + [ + "literal" + "delta" + ] @keyword + (size) @number) + +forward: (binary_hunk + (payload) @diff.plus) + +reverse: (binary_hunk + (payload) @diff.minus) diff --git a/assets/parsers/diff/tree-sitter-diff.wasm b/assets/parsers/diff/tree-sitter-diff.wasm new file mode 100644 index 0000000000000000000000000000000000000000..6f2db8ff6e4cd95db35f2a36d7d5823bd9303f97 GIT binary patch literal 58931 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 IA#Mfz4>ER&kN^Mx literal 0 HcmV?d00001 diff --git a/parsers-config.json b/parsers-config.json index 582659c..ea19f70 100644 --- a/parsers-config.json +++ b/parsers-config.json @@ -85,6 +85,14 @@ "https://raw.githubusercontent.com/nvim-treesitter/nvim-treesitter/master/queries/css/highlights.scm" ] } + }, + { + "filetype": "diff", + "aliases": ["patch"], + "wasm": "https://github.com/tree-sitter-grammars/tree-sitter-diff/releases/download/v0.2.0/tree-sitter-diff.wasm", + "queries": { + "highlights": ["./assets/parsers/diff/highlights.scm"] + } } ] } diff --git a/src/app/lib/renderAnsi.test.ts b/src/app/lib/renderAnsi.test.ts index c512616..4f50ce5 100644 --- a/src/app/lib/renderAnsi.test.ts +++ b/src/app/lib/renderAnsi.test.ts @@ -3,8 +3,13 @@ import { dlopen, suffix } from 'bun:ffi' import { getTreeSitterClient } from '@opentui/core' import { buildTree } from './ast' import { renderAnsi } from './renderAnsi' +import { theme } from '../styles/theme' const stripAnsi = (s: string): string => s.replace(/\x1b\[[0-9;]*m/g, '') +const fg = (hex: string): string => { + const [r, g, b] = [1, 3, 5].map(i => parseInt(hex.slice(i, i + 2), 16)) + return `38;2;${r};${g};${b}m` +} describe('renderAnsi', () => { test('renders heading and paragraph text', async () => { @@ -77,6 +82,16 @@ describe('renderAnsi', () => { expect(escCount(highlighted)).toBeGreaterThan(escCount(plain)) }) + test.each(['diff', 'patch'])('colors %s fence lines, markers included', async lang => { + const out = await renderAnsi({ + nodes: buildTree(`\`\`\`${lang}\n@@ -1 +1 @@\n-old\n+new\n\`\`\`\n`).nodes, + width: 80, + maxHeight: 200, + }) + expect(out).toContain(`${fg(theme.red)}-old`) + expect(out).toContain(`${fg(theme.green)}+new`) + }) + test.skipIf(process.platform === 'win32')( 'leaves stdout blocking after render (OpenTUI sets O_NONBLOCK on fd 1)', async () => { diff --git a/src/app/parsers.ts b/src/app/parsers.ts index 4bba8fd..b5af038 100644 --- a/src/app/parsers.ts +++ b/src/app/parsers.ts @@ -20,6 +20,8 @@ import htmlWasm from '../../assets/parsers/html/tree-sitter-html.wasm' with { ty import htmlHighlights from '../../assets/parsers/html/highlights.scm' with { type: 'file' } import cssWasm from '../../assets/parsers/css/tree-sitter-css.wasm' with { type: 'file' } import cssHighlights from '../../assets/parsers/css/highlights.scm' with { type: 'file' } +import diffWasm from '../../assets/parsers/diff/tree-sitter-diff.wasm' with { type: 'file' } +import diffHighlights from '../../assets/parsers/diff/highlights.scm' with { type: 'file' } export const extraParsers: FiletypeParserOptions[] = [ parser('bash', bashWasm, bashHighlights, ['sh', 'shell', 'zsh']), @@ -31,6 +33,7 @@ export const extraParsers: FiletypeParserOptions[] = [ parser('toml', tomlWasm, tomlHighlights), parser('html', htmlWasm, htmlHighlights, ['htm']), parser('css', cssWasm, cssHighlights), + parser('diff', diffWasm, diffHighlights, ['patch']), ] function parser( diff --git a/src/app/styles/syntax-style.ts b/src/app/styles/syntax-style.ts index 16ec98b..0db1ec7 100644 --- a/src/app/styles/syntax-style.ts +++ b/src/app/styles/syntax-style.ts @@ -1,4 +1,5 @@ import { SyntaxStyle } from '@opentui/core' +import { theme } from './theme' // VS Code Dark+ inspired token colors keyed by tree-sitter scope names. export const syntaxStyle = SyntaxStyle.fromStyles({ @@ -30,4 +31,7 @@ export const syntaxStyle = SyntaxStyle.fromStyles({ attribute: { fg: '#9cdcfe' }, escape: { fg: '#d7ba7d' }, label: { fg: '#c8c8c8' }, + 'diff.plus': { fg: theme.green }, + 'diff.minus': { fg: theme.red }, + 'diff.delta': { fg: theme.yellow }, }) diff --git a/test/lang-parsers.md b/test/lang-parsers.md index 3646e07..8d867d1 100644 --- a/test/lang-parsers.md +++ b/test/lang-parsers.md @@ -113,6 +113,20 @@ opentui = "*" } ``` +## Diff + +```diff +diff --git a/src/greet.ts b/src/greet.ts +index 3350e91..a9f836e 100644 +--- a/src/greet.ts ++++ b/src/greet.ts +@@ -1,3 +1,3 @@ export function greet() + export function greet(name: string) { +- return 'Hello, ' + name ++ return `Hello, ${name}!` + } +``` + ## Zig ```zig