| |
| |
| |
| |
| |
|
|
| import type React from 'react'; |
| import { Box, Text, useIsScreenReaderEnabled } from 'ink'; |
| import { Colors } from '../../colors.js'; |
| import crypto from 'node:crypto'; |
| import { colorizeCode, colorizeLine } from '../../utils/CodeColorizer.js'; |
| import { MaxSizedBox } from '../shared/MaxSizedBox.js'; |
| import { theme } from '../../semantic-colors.js'; |
|
|
| interface DiffLine { |
| type: 'add' | 'del' | 'context' | 'hunk' | 'other'; |
| oldLine?: number; |
| newLine?: number; |
| content: string; |
| } |
|
|
| function parseDiffWithLineNumbers(diffContent: string): DiffLine[] { |
| const lines = diffContent.split('\n'); |
| const result: DiffLine[] = []; |
| let currentOldLine = 0; |
| let currentNewLine = 0; |
| let inHunk = false; |
| const hunkHeaderRegex = /^@@ -(\d+),?\d* \+(\d+),?\d* @@/; |
|
|
| for (const line of lines) { |
| const hunkMatch = line.match(hunkHeaderRegex); |
| if (hunkMatch) { |
| currentOldLine = parseInt(hunkMatch[1], 10); |
| currentNewLine = parseInt(hunkMatch[2], 10); |
| inHunk = true; |
| result.push({ type: 'hunk', content: line }); |
| |
| |
| currentOldLine--; |
| currentNewLine--; |
| continue; |
| } |
| if (!inHunk) { |
| |
| if ( |
| line.startsWith('--- ') || |
| line.startsWith('+++ ') || |
| line.startsWith('diff --git') || |
| line.startsWith('index ') || |
| line.startsWith('similarity index') || |
| line.startsWith('rename from') || |
| line.startsWith('rename to') || |
| line.startsWith('new file mode') || |
| line.startsWith('deleted file mode') |
| ) |
| continue; |
| |
| continue; |
| } |
| if (line.startsWith('+')) { |
| currentNewLine++; |
| result.push({ |
| type: 'add', |
| newLine: currentNewLine, |
| content: line.substring(1), |
| }); |
| } else if (line.startsWith('-')) { |
| currentOldLine++; |
| result.push({ |
| type: 'del', |
| oldLine: currentOldLine, |
| content: line.substring(1), |
| }); |
| } else if (line.startsWith(' ')) { |
| currentOldLine++; |
| currentNewLine++; |
| result.push({ |
| type: 'context', |
| oldLine: currentOldLine, |
| newLine: currentNewLine, |
| content: line.substring(1), |
| }); |
| } else if (line.startsWith('\\')) { |
| |
| result.push({ type: 'other', content: line }); |
| } |
| } |
| return result; |
| } |
|
|
| interface DiffRendererProps { |
| diffContent: string; |
| filename?: string; |
| tabWidth?: number; |
| availableTerminalHeight?: number; |
| terminalWidth: number; |
| theme?: import('../../themes/theme.js').Theme; |
| } |
|
|
| const DEFAULT_TAB_WIDTH = 4; |
|
|
| export const DiffRenderer: React.FC<DiffRendererProps> = ({ |
| diffContent, |
| filename, |
| tabWidth = DEFAULT_TAB_WIDTH, |
| availableTerminalHeight, |
| terminalWidth, |
| theme, |
| }) => { |
| const screenReaderEnabled = useIsScreenReaderEnabled(); |
| if (!diffContent || typeof diffContent !== 'string') { |
| return <Text color={Colors.AccentYellow}>No diff content.</Text>; |
| } |
|
|
| const parsedLines = parseDiffWithLineNumbers(diffContent); |
|
|
| if (parsedLines.length === 0) { |
| return ( |
| <Box borderStyle="round" borderColor={Colors.Gray} padding={1}> |
| <Text dimColor>No changes detected.</Text> |
| </Box> |
| ); |
| } |
| if (screenReaderEnabled) { |
| return ( |
| <Box flexDirection="column"> |
| {parsedLines.map((line, index) => ( |
| <Text key={index}> |
| {line.type}: {line.content} |
| </Text> |
| ))} |
| </Box> |
| ); |
| } |
|
|
| |
| const isNewFile = parsedLines.every( |
| (line) => |
| line.type === 'add' || |
| line.type === 'hunk' || |
| line.type === 'other' || |
| line.content.startsWith('diff --git') || |
| line.content.startsWith('new file mode'), |
| ); |
|
|
| let renderedOutput; |
|
|
| if (isNewFile) { |
| |
| const addedContent = parsedLines |
| .filter((line) => line.type === 'add') |
| .map((line) => line.content) |
| .join('\n'); |
| |
| const fileExtension = filename?.split('.').pop() || null; |
| const language = fileExtension |
| ? getLanguageFromExtension(fileExtension) |
| : null; |
| renderedOutput = colorizeCode( |
| addedContent, |
| language, |
| availableTerminalHeight, |
| terminalWidth, |
| theme, |
| ); |
| } else { |
| renderedOutput = renderDiffContent( |
| parsedLines, |
| filename, |
| tabWidth, |
| availableTerminalHeight, |
| terminalWidth, |
| ); |
| } |
|
|
| return renderedOutput; |
| }; |
|
|
| const renderDiffContent = ( |
| parsedLines: DiffLine[], |
| filename: string | undefined, |
| tabWidth = DEFAULT_TAB_WIDTH, |
| availableTerminalHeight: number | undefined, |
| terminalWidth: number, |
| ) => { |
| |
| const normalizedLines = parsedLines.map((line) => ({ |
| ...line, |
| content: line.content.replace(/\t/g, ' '.repeat(tabWidth)), |
| })); |
|
|
| |
| const displayableLines = normalizedLines.filter( |
| (l) => l.type !== 'hunk' && l.type !== 'other', |
| ); |
|
|
| if (displayableLines.length === 0) { |
| return ( |
| <Box borderStyle="round" borderColor={Colors.Gray} padding={1}> |
| <Text dimColor>No changes detected.</Text> |
| </Box> |
| ); |
| } |
|
|
| const maxLineNumber = Math.max( |
| 0, |
| ...displayableLines.map((l) => l.oldLine ?? 0), |
| ...displayableLines.map((l) => l.newLine ?? 0), |
| ); |
| const gutterWidth = Math.max(1, maxLineNumber.toString().length); |
|
|
| const fileExtension = filename?.split('.').pop() || null; |
| const language = fileExtension |
| ? getLanguageFromExtension(fileExtension) |
| : null; |
|
|
| |
| let baseIndentation = Infinity; |
| for (const line of displayableLines) { |
| |
| if (line.content.trim() === '') continue; |
|
|
| const firstCharIndex = line.content.search(/\S/); |
| const currentIndent = firstCharIndex === -1 ? 0 : firstCharIndex; |
| baseIndentation = Math.min(baseIndentation, currentIndent); |
| } |
| |
| if (!isFinite(baseIndentation)) { |
| baseIndentation = 0; |
| } |
|
|
| const key = filename |
| ? `diff-box-${filename}` |
| : `diff-box-${crypto.createHash('sha1').update(JSON.stringify(parsedLines)).digest('hex')}`; |
|
|
| let lastLineNumber: number | null = null; |
| const MAX_CONTEXT_LINES_WITHOUT_GAP = 5; |
|
|
| return ( |
| <MaxSizedBox |
| maxHeight={availableTerminalHeight} |
| maxWidth={terminalWidth} |
| key={key} |
| > |
| {displayableLines.reduce<React.ReactNode[]>((acc, line, index) => { |
| // Determine the relevant line number for gap calculation based on type |
| let relevantLineNumberForGapCalc: number | null = null; |
| if (line.type === 'add' || line.type === 'context') { |
| relevantLineNumberForGapCalc = line.newLine ?? null; |
| } else if (line.type === 'del') { |
| // For deletions, the gap is typically in relation to the original file's line numbering |
| relevantLineNumberForGapCalc = line.oldLine ?? null; |
| } |
| |
| if ( |
| lastLineNumber !== null && |
| relevantLineNumberForGapCalc !== null && |
| relevantLineNumberForGapCalc > |
| lastLineNumber + MAX_CONTEXT_LINES_WITHOUT_GAP + 1 |
| ) { |
| acc.push( |
| <Box key={`gap-${index}`}> |
| <Text wrap="truncate" color={Colors.Gray}> |
| {'═'.repeat(terminalWidth)} |
| </Text> |
| </Box>, |
| ); |
| } |
| |
| const lineKey = `diff-line-${index}`; |
| let gutterNumStr = ''; |
| let prefixSymbol = ' '; |
| |
| switch (line.type) { |
| case 'add': |
| gutterNumStr = (line.newLine ?? '').toString(); |
| prefixSymbol = '+'; |
| lastLineNumber = line.newLine ?? null; |
| break; |
| case 'del': |
| gutterNumStr = (line.oldLine ?? '').toString(); |
| prefixSymbol = '-'; |
| // For deletions, update lastLineNumber based on oldLine if it's advancing. |
| // This helps manage gaps correctly if there are multiple consecutive deletions |
| // or if a deletion is followed by a context line far away in the original file. |
| if (line.oldLine !== undefined) { |
| lastLineNumber = line.oldLine; |
| } |
| break; |
| case 'context': |
| gutterNumStr = (line.newLine ?? '').toString(); |
| prefixSymbol = ' '; |
| lastLineNumber = line.newLine ?? null; |
| break; |
| default: |
| return acc; |
| } |
| |
| const displayContent = line.content.substring(baseIndentation); |
| |
| acc.push( |
| <Box key={lineKey} flexDirection="row"> |
| <Text |
| color={theme.text.secondary} |
| backgroundColor={ |
| line.type === 'add' |
| ? theme.background.diff.added |
| : line.type === 'del' |
| ? theme.background.diff.removed |
| : undefined |
| } |
| > |
| {gutterNumStr.padStart(gutterWidth)}{' '} |
| </Text> |
| {line.type === 'context' ? ( |
| <> |
| <Text>{prefixSymbol} </Text> |
| <Text wrap="wrap"> |
| {colorizeLine(displayContent, language)} |
| </Text> |
| </> |
| ) : ( |
| <Text |
| backgroundColor={ |
| line.type === 'add' |
| ? theme.background.diff.added |
| : theme.background.diff.removed |
| } |
| wrap="wrap" |
| > |
| <Text |
| color={ |
| line.type === 'add' |
| ? theme.status.success |
| : theme.status.error |
| } |
| > |
| {prefixSymbol} |
| </Text>{' '} |
| {colorizeLine(displayContent, language)} |
| </Text> |
| )} |
| </Box>, |
| ); |
| return acc; |
| }, [])} |
| </MaxSizedBox> |
| ); |
| }; |
|
|
| const getLanguageFromExtension = (extension: string): string | null => { |
| const languageMap: { [key: string]: string } = { |
| js: 'javascript', |
| ts: 'typescript', |
| py: 'python', |
| json: 'json', |
| css: 'css', |
| html: 'html', |
| sh: 'bash', |
| md: 'markdown', |
| yaml: 'yaml', |
| yml: 'yaml', |
| txt: 'plaintext', |
| java: 'java', |
| c: 'c', |
| cpp: 'cpp', |
| rb: 'ruby', |
| }; |
| return languageMap[extension] || null; |
| }; |
|
|