File size: 30,042 Bytes
064bfd6 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 | /**
* Pure TypeScript port of vendor/color-diff-src.
*
* The Rust version uses syntect+bat for syntax highlighting and the similar
* crate for word diffing. This port uses highlight.js (already a dep via
* cli-highlight) and the diff npm package's diffArrays.
*
* API matches vendor/color-diff-src/index.d.ts exactly so callers don't change.
*
* Key semantic differences from the native module:
* - Syntax highlighting uses highlight.js. Scope colors were measured from
* syntect's output so most tokens match, but hljs's grammar has gaps:
* plain identifiers and operators like `=` `:` aren't scoped, so they
* render in default fg instead of white/pink. Output structure (line
* numbers, markers, backgrounds, word-diff) is identical.
* - BAT_THEME env support is a stub: highlight.js has no bat theme set, so
* getSyntaxTheme always returns the default for the given Claude theme.
*/
import { diffArrays } from 'diff'
import type * as hljsNamespace from 'highlight.js'
import { basename, extname } from 'path'
// Lazy: defers loading highlight.js until first render. The full bundle
// registers 190+ language grammars at require time (~50MB, 100-200ms on
// macOS, several× that on Windows). With a top-level import, any caller
// chunk that reaches this module — including test/preload.ts via
// StructuredDiff.tsx → colorDiff.ts — pays that cost at module-eval time
// and carries the heap for the rest of the process. On Windows CI this
// pushed later tests in the same shard into GC-pause territory and a
// beforeEach/afterEach hook timeout (officialRegistry.test.ts, PR #24150).
// Same lazy pattern the NAPI wrapper used for dlopen.
type HLJSApi = typeof hljsNamespace
let cachedHljs: HLJSApi | null = null
function hljs(): HLJSApi {
if (cachedHljs) return cachedHljs
// eslint-disable-next-line @typescript-eslint/no-require-imports
const mod = require('highlight.js')
// highlight.js uses `export =` (CJS). Under bun/ESM the interop wraps it
// in .default; under node CJS the module IS the API. Check at runtime.
cachedHljs = 'default' in mod && mod.default ? mod.default : mod
return cachedHljs!
}
import { stringWidth } from '../../ink/stringWidth.js'
import { logError } from '../../utils/log.js'
// ---------------------------------------------------------------------------
// Public API types (match vendor/color-diff-src/index.d.ts)
// ---------------------------------------------------------------------------
export type Hunk = {
oldStart: number
oldLines: number
newStart: number
newLines: number
lines: string[]
}
export type SyntaxTheme = {
theme: string
source: string | null
}
export type NativeModule = {
ColorDiff: typeof ColorDiff
ColorFile: typeof ColorFile
getSyntaxTheme: (themeName: string) => SyntaxTheme
}
// ---------------------------------------------------------------------------
// Color / ANSI escape helpers
// ---------------------------------------------------------------------------
type Color = { r: number; g: number; b: number; a: number }
type Style = { foreground: Color; background: Color }
type Block = [Style, string]
type ColorMode = 'truecolor' | 'color256' | 'ansi'
const RESET = '\x1b[0m'
const DIM = '\x1b[2m'
const UNDIM = '\x1b[22m'
function rgb(r: number, g: number, b: number): Color {
return { r, g, b, a: 255 }
}
function ansiIdx(index: number): Color {
return { r: index, g: 0, b: 0, a: 0 }
}
// Sentinel: a=1 means "terminal default" (matches bat convention)
const DEFAULT_BG: Color = { r: 0, g: 0, b: 0, a: 1 }
function detectColorMode(theme: string): ColorMode {
if (theme.includes('ansi')) return 'ansi'
const ct = process.env.COLORTERM ?? ''
return ct === 'truecolor' || ct === '24bit' ? 'truecolor' : 'color256'
}
// Port of ansi_colours::ansi256_from_rgb — approximates RGB to the xterm-256
// palette (6x6x6 cube + 24 greys). Picks the perceptually closest index by
// comparing cube vs grey-ramp candidates, like the Rust crate.
const CUBE_LEVELS = [0, 95, 135, 175, 215, 255]
function ansi256FromRgb(r: number, g: number, b: number): number {
const q = (c: number) =>
c < 48 ? 0 : c < 115 ? 1 : c < 155 ? 2 : c < 195 ? 3 : c < 235 ? 4 : 5
const qr = q(r)
const qg = q(g)
const qb = q(b)
const cubeIdx = 16 + 36 * qr + 6 * qg + qb
// Grey ramp candidate (232-255, levels 8..238 step 10). Beyond the ramp's
// range the cube corner is the only option — ansi_colours snaps 248,248,242
// to 231 (cube white), not 255 (ramp top).
const grey = Math.round((r + g + b) / 3)
if (grey < 5) return 16
if (grey > 244 && qr === qg && qg === qb) return cubeIdx
const greyLevel = Math.max(0, Math.min(23, Math.round((grey - 8) / 10)))
const greyIdx = 232 + greyLevel
const greyRgb = 8 + greyLevel * 10
const cr = CUBE_LEVELS[qr]!
const cg = CUBE_LEVELS[qg]!
const cb = CUBE_LEVELS[qb]!
const dCube = (r - cr) ** 2 + (g - cg) ** 2 + (b - cb) ** 2
const dGrey = (r - greyRgb) ** 2 + (g - greyRgb) ** 2 + (b - greyRgb) ** 2
return dGrey < dCube ? greyIdx : cubeIdx
}
function colorToEscape(c: Color, fg: boolean, mode: ColorMode): string {
// alpha=0: palette index encoded in .r (bat's ansi-theme convention)
if (c.a === 0) {
const idx = c.r
if (idx < 8) return `\x1b[${(fg ? 30 : 40) + idx}m`
if (idx < 16) return `\x1b[${(fg ? 90 : 100) + (idx - 8)}m`
return `\x1b[${fg ? 38 : 48};5;${idx}m`
}
// alpha=1: terminal default
if (c.a === 1) return fg ? '\x1b[39m' : '\x1b[49m'
const codeType = fg ? 38 : 48
if (mode === 'truecolor') {
return `\x1b[${codeType};2;${c.r};${c.g};${c.b}m`
}
return `\x1b[${codeType};5;${ansi256FromRgb(c.r, c.g, c.b)}m`
}
function asTerminalEscaped(
blocks: readonly Block[],
mode: ColorMode,
skipBackground: boolean,
dim: boolean,
): string {
let out = dim ? RESET + DIM : RESET
for (const [style, text] of blocks) {
out += colorToEscape(style.foreground, true, mode)
if (!skipBackground) {
out += colorToEscape(style.background, false, mode)
}
out += text
}
return out + RESET
}
// ---------------------------------------------------------------------------
// Theme
// ---------------------------------------------------------------------------
type Marker = '+' | '-' | ' '
type Theme = {
addLine: Color
addWord: Color
addDecoration: Color
deleteLine: Color
deleteWord: Color
deleteDecoration: Color
foreground: Color
background: Color
scopes: Record<string, Color>
}
function defaultSyntaxThemeName(themeName: string): string {
if (themeName.includes('ansi')) return 'ansi'
if (themeName.includes('dark')) return 'Monokai Extended'
return 'GitHub'
}
// highlight.js scope → syntect Monokai Extended foreground (measured from the
// Rust module's output so colors match the original exactly)
const MONOKAI_SCOPES: Record<string, Color> = {
keyword: rgb(249, 38, 114),
_storage: rgb(102, 217, 239),
built_in: rgb(166, 226, 46),
type: rgb(166, 226, 46),
literal: rgb(190, 132, 255),
number: rgb(190, 132, 255),
string: rgb(230, 219, 116),
title: rgb(166, 226, 46),
'title.function': rgb(166, 226, 46),
'title.class': rgb(166, 226, 46),
'title.class.inherited': rgb(166, 226, 46),
params: rgb(253, 151, 31),
comment: rgb(117, 113, 94),
meta: rgb(117, 113, 94),
attr: rgb(166, 226, 46),
attribute: rgb(166, 226, 46),
variable: rgb(255, 255, 255),
'variable.language': rgb(255, 255, 255),
property: rgb(255, 255, 255),
operator: rgb(249, 38, 114),
punctuation: rgb(248, 248, 242),
symbol: rgb(190, 132, 255),
regexp: rgb(230, 219, 116),
subst: rgb(248, 248, 242),
}
// highlight.js scope → syntect GitHub-light foreground (measured from Rust)
const GITHUB_SCOPES: Record<string, Color> = {
keyword: rgb(167, 29, 93),
_storage: rgb(167, 29, 93),
built_in: rgb(0, 134, 179),
type: rgb(0, 134, 179),
literal: rgb(0, 134, 179),
number: rgb(0, 134, 179),
string: rgb(24, 54, 145),
title: rgb(121, 93, 163),
'title.function': rgb(121, 93, 163),
'title.class': rgb(0, 0, 0),
'title.class.inherited': rgb(0, 0, 0),
params: rgb(0, 134, 179),
comment: rgb(150, 152, 150),
meta: rgb(150, 152, 150),
attr: rgb(0, 134, 179),
attribute: rgb(0, 134, 179),
variable: rgb(0, 134, 179),
'variable.language': rgb(0, 134, 179),
property: rgb(0, 134, 179),
operator: rgb(167, 29, 93),
punctuation: rgb(51, 51, 51),
symbol: rgb(0, 134, 179),
regexp: rgb(24, 54, 145),
subst: rgb(51, 51, 51),
}
// Keywords that syntect scopes as storage.type rather than keyword.control.
// highlight.js lumps these under "keyword"; we re-split so const/function/etc.
// get the cyan storage color instead of pink.
const STORAGE_KEYWORDS = new Set([
'const',
'let',
'var',
'function',
'class',
'type',
'interface',
'enum',
'namespace',
'module',
'def',
'fn',
'func',
'struct',
'trait',
'impl',
])
const ANSI_SCOPES: Record<string, Color> = {
keyword: ansiIdx(13),
_storage: ansiIdx(14),
built_in: ansiIdx(14),
type: ansiIdx(14),
literal: ansiIdx(12),
number: ansiIdx(12),
string: ansiIdx(10),
title: ansiIdx(11),
'title.function': ansiIdx(11),
'title.class': ansiIdx(11),
comment: ansiIdx(8),
meta: ansiIdx(8),
}
function buildTheme(themeName: string, mode: ColorMode): Theme {
const isDark = themeName.includes('dark')
const isAnsi = themeName.includes('ansi')
const isDaltonized = themeName.includes('daltonized')
const tc = mode === 'truecolor'
if (isAnsi) {
return {
addLine: DEFAULT_BG,
addWord: DEFAULT_BG,
addDecoration: ansiIdx(10),
deleteLine: DEFAULT_BG,
deleteWord: DEFAULT_BG,
deleteDecoration: ansiIdx(9),
foreground: ansiIdx(7),
background: DEFAULT_BG,
scopes: ANSI_SCOPES,
}
}
if (isDark) {
const fg = rgb(248, 248, 242)
const deleteLine = rgb(61, 1, 0)
const deleteWord = rgb(92, 2, 0)
const deleteDecoration = rgb(220, 90, 90)
if (isDaltonized) {
return {
addLine: tc ? rgb(0, 27, 41) : ansiIdx(17),
addWord: tc ? rgb(0, 48, 71) : ansiIdx(24),
addDecoration: rgb(81, 160, 200),
deleteLine,
deleteWord,
deleteDecoration,
foreground: fg,
background: DEFAULT_BG,
scopes: MONOKAI_SCOPES,
}
}
return {
addLine: tc ? rgb(2, 40, 0) : ansiIdx(22),
addWord: tc ? rgb(4, 71, 0) : ansiIdx(28),
addDecoration: rgb(80, 200, 80),
deleteLine,
deleteWord,
deleteDecoration,
foreground: fg,
background: DEFAULT_BG,
scopes: MONOKAI_SCOPES,
}
}
// light
const fg = rgb(51, 51, 51)
const deleteLine = rgb(255, 220, 220)
const deleteWord = rgb(255, 199, 199)
const deleteDecoration = rgb(207, 34, 46)
if (isDaltonized) {
return {
addLine: rgb(219, 237, 255),
addWord: rgb(179, 217, 255),
addDecoration: rgb(36, 87, 138),
deleteLine,
deleteWord,
deleteDecoration,
foreground: fg,
background: DEFAULT_BG,
scopes: GITHUB_SCOPES,
}
}
return {
addLine: rgb(220, 255, 220),
addWord: rgb(178, 255, 178),
addDecoration: rgb(36, 138, 61),
deleteLine,
deleteWord,
deleteDecoration,
foreground: fg,
background: DEFAULT_BG,
scopes: GITHUB_SCOPES,
}
}
function defaultStyle(theme: Theme): Style {
return { foreground: theme.foreground, background: theme.background }
}
function lineBackground(marker: Marker, theme: Theme): Color {
switch (marker) {
case '+':
return theme.addLine
case '-':
return theme.deleteLine
case ' ':
return theme.background
}
}
function wordBackground(marker: Marker, theme: Theme): Color {
switch (marker) {
case '+':
return theme.addWord
case '-':
return theme.deleteWord
case ' ':
return theme.background
}
}
function decorationColor(marker: Marker, theme: Theme): Color {
switch (marker) {
case '+':
return theme.addDecoration
case '-':
return theme.deleteDecoration
case ' ':
return theme.foreground
}
}
// ---------------------------------------------------------------------------
// Syntax highlighting via highlight.js
// ---------------------------------------------------------------------------
// hljs 10.x uses `kind`; 11.x uses `scope`. Handle both.
type HljsNode = {
scope?: string
kind?: string
children: (HljsNode | string)[]
}
// Filename-based and extension-based language detection (approximates bat's
// SyntaxMapping + syntect's find_syntax_by_extension)
const FILENAME_LANGS: Record<string, string> = {
Dockerfile: 'dockerfile',
Makefile: 'makefile',
Rakefile: 'ruby',
Gemfile: 'ruby',
CMakeLists: 'cmake',
}
function detectLanguage(
filePath: string,
firstLine: string | null,
): string | null {
const base = basename(filePath)
const ext = extname(filePath).slice(1)
// Filename-based lookup (handles Dockerfile, Makefile, CMakeLists.txt, etc.)
const stem = base.split('.')[0] ?? ''
const byName = FILENAME_LANGS[base] ?? FILENAME_LANGS[stem]
if (byName && hljs().getLanguage(byName)) return byName
if (ext) {
const lang = hljs().getLanguage(ext)
if (lang) return ext
}
// Shebang / first-line detection (strip UTF-8 BOM)
if (firstLine) {
const line = firstLine.startsWith('\ufeff') ? firstLine.slice(1) : firstLine
if (line.startsWith('#!')) {
if (line.includes('bash') || line.includes('/sh')) return 'bash'
if (line.includes('python')) return 'python'
if (line.includes('node')) return 'javascript'
if (line.includes('ruby')) return 'ruby'
if (line.includes('perl')) return 'perl'
}
if (line.startsWith('<?php')) return 'php'
if (line.startsWith('<?xml')) return 'xml'
}
return null
}
function scopeColor(
scope: string | undefined,
text: string,
theme: Theme,
): Color {
if (!scope) return theme.foreground
if (scope === 'keyword' && STORAGE_KEYWORDS.has(text.trim())) {
return theme.scopes['_storage'] ?? theme.foreground
}
return (
theme.scopes[scope] ??
theme.scopes[scope.split('.')[0]!] ??
theme.foreground
)
}
function flattenHljs(
node: HljsNode | string,
theme: Theme,
parentScope: string | undefined,
out: Block[],
): void {
if (typeof node === 'string') {
const fg = scopeColor(parentScope, node, theme)
out.push([{ foreground: fg, background: theme.background }, node])
return
}
const scope = node.scope ?? node.kind ?? parentScope
for (const child of node.children) {
flattenHljs(child, theme, scope, out)
}
}
// result.emitter is in the public HighlightResult type, but rootNode is
// internal to TokenTreeEmitter. Type guard validates the shape once so we
// fail loudly (via logError) instead of a silent try/catch swallow — the
// prior `as unknown as` cast hid a version mismatch (_emitter vs emitter,
// scope vs kind) behind a silent gray fallback.
function hasRootNode(emitter: unknown): emitter is { rootNode: HljsNode } {
return (
typeof emitter === 'object' &&
emitter !== null &&
'rootNode' in emitter &&
typeof emitter.rootNode === 'object' &&
emitter.rootNode !== null &&
'children' in emitter.rootNode
)
}
let loggedEmitterShapeError = false
function highlightLine(
state: { lang: string | null; stack: unknown },
line: string,
theme: Theme,
): Block[] {
// syntect-parity: feed a trailing \n so line comments terminate, then strip
const code = line + '\n'
if (!state.lang) {
return [[defaultStyle(theme), code]]
}
let result
try {
result = hljs().highlight(code, {
language: state.lang,
ignoreIllegals: true,
})
} catch {
// hljs throws on unknown language despite ignoreIllegals
return [[defaultStyle(theme), code]]
}
if (!hasRootNode(result.emitter)) {
if (!loggedEmitterShapeError) {
loggedEmitterShapeError = true
logError(
new Error(
`color-diff: hljs emitter shape mismatch (keys: ${Object.keys(result.emitter).join(',')}). Syntax highlighting disabled.`,
),
)
}
return [[defaultStyle(theme), code]]
}
const blocks: Block[] = []
flattenHljs(result.emitter.rootNode, theme, undefined, blocks)
return blocks
}
// ---------------------------------------------------------------------------
// Word diff
// ---------------------------------------------------------------------------
type Range = { start: number; end: number }
const CHANGE_THRESHOLD = 0.4
// Tokenize into word runs, whitespace runs, and single punctuation chars —
// matches the Rust tokenize() which mirrors diffWordsWithSpace's splitting.
function tokenize(text: string): string[] {
const tokens: string[] = []
let i = 0
while (i < text.length) {
const ch = text[i]!
if (/[\p{L}\p{N}_]/u.test(ch)) {
let j = i + 1
while (j < text.length && /[\p{L}\p{N}_]/u.test(text[j]!)) j++
tokens.push(text.slice(i, j))
i = j
} else if (/\s/.test(ch)) {
let j = i + 1
while (j < text.length && /\s/.test(text[j]!)) j++
tokens.push(text.slice(i, j))
i = j
} else {
// advance one codepoint (handle surrogate pairs)
const cp = text.codePointAt(i)!
const len = cp > 0xffff ? 2 : 1
tokens.push(text.slice(i, i + len))
i += len
}
}
return tokens
}
function findAdjacentPairs(markers: Marker[]): [number, number][] {
const pairs: [number, number][] = []
let i = 0
while (i < markers.length) {
if (markers[i] === '-') {
const delStart = i
let delEnd = i
while (delEnd < markers.length && markers[delEnd] === '-') delEnd++
let addEnd = delEnd
while (addEnd < markers.length && markers[addEnd] === '+') addEnd++
const delCount = delEnd - delStart
const addCount = addEnd - delEnd
if (delCount > 0 && addCount > 0) {
const n = Math.min(delCount, addCount)
for (let k = 0; k < n; k++) {
pairs.push([delStart + k, delEnd + k])
}
i = addEnd
} else {
i = delEnd
}
} else {
i++
}
}
return pairs
}
function wordDiffStrings(oldStr: string, newStr: string): [Range[], Range[]] {
const oldTokens = tokenize(oldStr)
const newTokens = tokenize(newStr)
const ops = diffArrays(oldTokens, newTokens)
const totalLen = oldStr.length + newStr.length
let changedLen = 0
const oldRanges: Range[] = []
const newRanges: Range[] = []
let oldOff = 0
let newOff = 0
for (const op of ops) {
const len = op.value.reduce((s, t) => s + t.length, 0)
if (op.removed) {
changedLen += len
oldRanges.push({ start: oldOff, end: oldOff + len })
oldOff += len
} else if (op.added) {
changedLen += len
newRanges.push({ start: newOff, end: newOff + len })
newOff += len
} else {
oldOff += len
newOff += len
}
}
if (totalLen > 0 && changedLen / totalLen > CHANGE_THRESHOLD) {
return [[], []]
}
return [oldRanges, newRanges]
}
// ---------------------------------------------------------------------------
// Highlight (per-line transform pipeline)
// ---------------------------------------------------------------------------
type Highlight = {
marker: Marker | null
lineNumber: number
lines: Block[][]
}
function removeNewlines(h: Highlight): void {
h.lines = h.lines.map(line =>
line.flatMap(([style, text]) =>
text
.split('\n')
.filter(p => p.length > 0)
.map((p): Block => [style, p]),
),
)
}
function charWidth(ch: string): number {
return stringWidth(ch)
}
function wrapText(h: Highlight, width: number, theme: Theme): void {
const newLines: Block[][] = []
for (const line of h.lines) {
const queue: Block[] = line.slice()
let cur: Block[] = []
let curW = 0
while (queue.length > 0) {
const [style, text] = queue.shift()!
const tw = stringWidth(text)
if (curW + tw <= width) {
cur.push([style, text])
curW += tw
} else {
const remaining = width - curW
let bytePos = 0
let accW = 0
// iterate by codepoint
for (const ch of text) {
const cw = charWidth(ch)
if (accW + cw > remaining) break
accW += cw
bytePos += ch.length
}
if (bytePos === 0) {
if (curW === 0) {
// Fresh line and first char still doesn't fit — force one codepoint
// to guarantee forward progress (overflows, but prevents infinite loop)
const firstCp = text.codePointAt(0)!
bytePos = firstCp > 0xffff ? 2 : 1
} else {
// Line has content and next char doesn't fit — finish this line,
// re-queue the whole block for a fresh line
newLines.push(cur)
queue.unshift([style, text])
cur = []
curW = 0
continue
}
}
cur.push([style, text.slice(0, bytePos)])
newLines.push(cur)
queue.unshift([style, text.slice(bytePos)])
cur = []
curW = 0
}
}
newLines.push(cur)
}
h.lines = newLines
// Pad changed lines so background extends to edge
if (h.marker && h.marker !== ' ') {
const bg = lineBackground(h.marker, theme)
const padStyle: Style = { foreground: theme.foreground, background: bg }
for (const line of h.lines) {
const curW = line.reduce((s, [, t]) => s + stringWidth(t), 0)
if (curW < width) {
line.push([padStyle, ' '.repeat(width - curW)])
}
}
}
}
function addLineNumber(
h: Highlight,
theme: Theme,
maxDigits: number,
fullDim: boolean,
): void {
const style: Style = {
foreground: h.marker ? decorationColor(h.marker, theme) : theme.foreground,
background: h.marker ? lineBackground(h.marker, theme) : theme.background,
}
const shouldDim = h.marker === null || h.marker === ' '
for (let i = 0; i < h.lines.length; i++) {
const prefix =
i === 0
? ` ${String(h.lineNumber).padStart(maxDigits)} `
: ' '.repeat(maxDigits + 2)
const wrapped = shouldDim && !fullDim ? `${DIM}${prefix}${UNDIM}` : prefix
h.lines[i]!.unshift([style, wrapped])
}
}
function addMarker(h: Highlight, theme: Theme): void {
if (!h.marker) return
const style: Style = {
foreground: decorationColor(h.marker, theme),
background: lineBackground(h.marker, theme),
}
for (const line of h.lines) {
line.unshift([style, h.marker])
}
}
function dimContent(h: Highlight): void {
for (const line of h.lines) {
if (line.length > 0) {
line[0]![1] = DIM + line[0]![1]
const last = line.length - 1
line[last]![1] = line[last]![1] + UNDIM
}
}
}
function applyBackground(h: Highlight, theme: Theme, ranges: Range[]): void {
if (!h.marker) return
const lineBg = lineBackground(h.marker, theme)
const wordBg = wordBackground(h.marker, theme)
let rangeIdx = 0
let byteOff = 0
for (let li = 0; li < h.lines.length; li++) {
const newLine: Block[] = []
for (const [style, text] of h.lines[li]!) {
const textStart = byteOff
const textEnd = byteOff + text.length
while (rangeIdx < ranges.length && ranges[rangeIdx]!.end <= textStart) {
rangeIdx++
}
if (rangeIdx >= ranges.length) {
newLine.push([{ ...style, background: lineBg }, text])
byteOff = textEnd
continue
}
let remaining = text
let pos = textStart
while (remaining.length > 0 && rangeIdx < ranges.length) {
const r = ranges[rangeIdx]!
const inRange = pos >= r.start && pos < r.end
let next: number
if (inRange) {
next = Math.min(r.end, textEnd)
} else if (r.start > pos && r.start < textEnd) {
next = r.start
} else {
next = textEnd
}
const segLen = next - pos
const seg = remaining.slice(0, segLen)
newLine.push([{ ...style, background: inRange ? wordBg : lineBg }, seg])
remaining = remaining.slice(segLen)
pos = next
if (pos >= r.end) rangeIdx++
}
if (remaining.length > 0) {
newLine.push([{ ...style, background: lineBg }, remaining])
}
byteOff = textEnd
}
h.lines[li] = newLine
}
}
function intoLines(
h: Highlight,
dim: boolean,
skipBg: boolean,
mode: ColorMode,
): string[] {
return h.lines.map(line => asTerminalEscaped(line, mode, skipBg, dim))
}
// ---------------------------------------------------------------------------
// Public API
// ---------------------------------------------------------------------------
function maxLineNumber(hunk: Hunk): number {
const oldEnd = Math.max(0, hunk.oldStart + hunk.oldLines - 1)
const newEnd = Math.max(0, hunk.newStart + hunk.newLines - 1)
return Math.max(oldEnd, newEnd)
}
function parseMarker(s: string): Marker {
return s === '+' || s === '-' ? s : ' '
}
export class ColorDiff {
private hunk: Hunk
private filePath: string
private firstLine: string | null
private prefixContent: string | null
constructor(
hunk: Hunk,
firstLine: string | null,
filePath: string,
prefixContent?: string | null,
) {
this.hunk = hunk
this.filePath = filePath
this.firstLine = firstLine
this.prefixContent = prefixContent ?? null
}
render(themeName: string, width: number, dim: boolean): string[] | null {
const mode = detectColorMode(themeName)
const theme = buildTheme(themeName, mode)
const lang = detectLanguage(this.filePath, this.firstLine)
const hlState = { lang, stack: null }
// Warm highlighter with prefix lines (highlight.js is stateless per call,
// so this is a no-op for now — preserved for API parity)
void this.prefixContent
const maxDigits = String(maxLineNumber(this.hunk)).length
let oldLine = this.hunk.oldStart
let newLine = this.hunk.newStart
const effectiveWidth = Math.max(1, width - maxDigits - 2 - 1)
// First pass: assign markers + line numbers
type Entry = { lineNumber: number; marker: Marker; code: string }
const entries: Entry[] = this.hunk.lines.map(rawLine => {
const marker = parseMarker(rawLine.slice(0, 1))
const code = rawLine.slice(1)
let lineNumber: number
switch (marker) {
case '+':
lineNumber = newLine++
break
case '-':
lineNumber = oldLine++
break
case ' ':
lineNumber = newLine
oldLine++
newLine++
break
}
return { lineNumber, marker, code }
})
// Word-diff ranges (skip when dim — too loud)
const ranges: Range[][] = entries.map(() => [])
if (!dim) {
const markers = entries.map(e => e.marker)
for (const [delIdx, addIdx] of findAdjacentPairs(markers)) {
const [delR, addR] = wordDiffStrings(
entries[delIdx]!.code,
entries[addIdx]!.code,
)
ranges[delIdx] = delR
ranges[addIdx] = addR
}
}
// Second pass: highlight + transform pipeline
const out: string[] = []
for (let i = 0; i < entries.length; i++) {
const { lineNumber, marker, code } = entries[i]!
const tokens: Block[] =
marker === '-'
? [[defaultStyle(theme), code]]
: highlightLine(hlState, code, theme)
const h: Highlight = { marker, lineNumber, lines: [tokens] }
removeNewlines(h)
applyBackground(h, theme, ranges[i]!)
wrapText(h, effectiveWidth, theme)
if (mode === 'ansi' && marker === '-') {
dimContent(h)
}
addMarker(h, theme)
addLineNumber(h, theme, maxDigits, dim)
out.push(...intoLines(h, dim, false, mode))
}
return out
}
}
export class ColorFile {
private code: string
private filePath: string
constructor(code: string, filePath: string) {
this.code = code
this.filePath = filePath
}
render(themeName: string, width: number, dim: boolean): string[] | null {
const mode = detectColorMode(themeName)
const theme = buildTheme(themeName, mode)
const lines = this.code.split('\n')
// Rust .lines() drops trailing empty line from trailing \n
if (lines.length > 0 && lines[lines.length - 1] === '') lines.pop()
const firstLine = lines[0] ?? null
const lang = detectLanguage(this.filePath, firstLine)
const hlState = { lang, stack: null }
const maxDigits = String(lines.length).length
const effectiveWidth = Math.max(1, width - maxDigits - 2)
const out: string[] = []
for (let i = 0; i < lines.length; i++) {
const tokens = highlightLine(hlState, lines[i]!, theme)
const h: Highlight = { marker: null, lineNumber: i + 1, lines: [tokens] }
removeNewlines(h)
wrapText(h, effectiveWidth, theme)
addLineNumber(h, theme, maxDigits, dim)
out.push(...intoLines(h, dim, true, mode))
}
return out
}
}
export function getSyntaxTheme(themeName: string): SyntaxTheme {
// highlight.js has no bat theme set, so env vars can't select alternate
// syntect themes. We still report the env var if set, for diagnostics.
const envTheme =
process.env.CLAUDE_CODE_SYNTAX_HIGHLIGHT ?? process.env.BAT_THEME
void envTheme
return { theme: defaultSyntaxThemeName(themeName), source: null }
}
// Lazy loader to match vendor/color-diff-src/index.ts API
let cachedModule: NativeModule | null = null
export function getNativeModule(): NativeModule | null {
if (cachedModule) return cachedModule
cachedModule = { ColorDiff, ColorFile, getSyntaxTheme }
return cachedModule
}
export type { ColorDiff as ColorDiffClass, ColorFile as ColorFileClass }
// Exported for testing
export const __test = {
tokenize,
findAdjacentPairs,
wordDiffStrings,
ansi256FromRgb,
colorToEscape,
detectColorMode,
detectLanguage,
}
|