Files
opencode/packages/web/src/components/DiffView.tsx
2025-06-26 13:06:41 -04:00

247 lines
7.0 KiB
TypeScript

import { type Component, createMemo } from "solid-js"
import { parsePatch } from "diff"
import CodeBlock from "./CodeBlock"
import styles from "./diffview.module.css"
type DiffRow = {
left: string
right: string
type: "added" | "removed" | "unchanged" | "modified"
}
interface DiffViewProps {
diff: string
lang?: string
class?: string
}
const DiffView: Component<DiffViewProps> = (props) => {
const rows = createMemo(() => {
const diffRows: DiffRow[] = []
try {
const patches = parsePatch(props.diff)
for (const patch of patches) {
for (const hunk of patch.hunks) {
const lines = hunk.lines
let i = 0
while (i < lines.length) {
const line = lines[i]
const content = line.slice(1)
const prefix = line[0]
if (prefix === '-') {
// Look ahead for consecutive additions to pair with removals
const removals: string[] = [content]
let j = i + 1
// Collect all consecutive removals
while (j < lines.length && lines[j][0] === '-') {
removals.push(lines[j].slice(1))
j++
}
// Collect all consecutive additions that follow
const additions: string[] = []
while (j < lines.length && lines[j][0] === '+') {
additions.push(lines[j].slice(1))
j++
}
// Pair removals with additions
const maxLength = Math.max(removals.length, additions.length)
for (let k = 0; k < maxLength; k++) {
const hasLeft = k < removals.length
const hasRight = k < additions.length
if (hasLeft && hasRight) {
// Replacement - left is removed, right is added
diffRows.push({
left: removals[k],
right: additions[k],
type: "modified"
})
} else if (hasLeft) {
// Pure removal
diffRows.push({
left: removals[k],
right: "",
type: "removed"
})
} else if (hasRight) {
// Pure addition - only create if we actually have content
diffRows.push({
left: "",
right: additions[k],
type: "added"
})
}
}
i = j
} else if (prefix === '+') {
// Standalone addition (not paired with removal)
diffRows.push({
left: "",
right: content,
type: "added"
})
i++
} else if (prefix === ' ') {
diffRows.push({
left: content,
right: content,
type: "unchanged"
})
i++
} else {
i++
}
}
}
}
} catch (error) {
console.error("Failed to parse patch:", error)
return []
}
return diffRows
})
const mobileRows = createMemo(() => {
const mobileBlocks: { type: 'removed' | 'added' | 'unchanged', lines: string[] }[] = []
const currentRows = rows()
let i = 0
while (i < currentRows.length) {
const removedLines: string[] = []
const addedLines: string[] = []
// Collect consecutive modified/removed/added rows
while (i < currentRows.length &&
(currentRows[i].type === 'modified' ||
currentRows[i].type === 'removed' ||
currentRows[i].type === 'added')) {
const row = currentRows[i]
if (row.left && (row.type === 'removed' || row.type === 'modified')) {
removedLines.push(row.left)
}
if (row.right && (row.type === 'added' || row.type === 'modified')) {
addedLines.push(row.right)
}
i++
}
// Add grouped blocks
if (removedLines.length > 0) {
mobileBlocks.push({ type: 'removed', lines: removedLines })
}
if (addedLines.length > 0) {
mobileBlocks.push({ type: 'added', lines: addedLines })
}
// Add unchanged rows as-is
if (i < currentRows.length && currentRows[i].type === 'unchanged') {
mobileBlocks.push({
type: 'unchanged',
lines: [currentRows[i].left]
})
i++
}
}
return mobileBlocks
})
return (
<div class={`${styles.diff} ${props.class ?? ""}`}>
<div class={styles.desktopView}>
{rows().map((r) => (
<div class={styles.row}>
<div class={styles.beforeColumn}>
<CodeBlock
code={r.left}
lang={props.lang}
data-section="cell"
data-diff-type={r.type === "removed" || r.type === "modified" ? "removed" : ""}
/>
</div>
<div class={styles.afterColumn}>
<CodeBlock
code={r.right}
lang={props.lang}
data-section="cell"
data-diff-type={r.type === "added" || r.type === "modified" ? "added" : ""}
/>
</div>
</div>
))}
</div>
<div class={styles.mobileView}>
{mobileRows().map((block) => (
<div class={styles.mobileBlock}>
{block.lines.map((line) => (
<CodeBlock
code={line}
lang={props.lang}
data-section="cell"
data-diff-type={block.type === 'removed' ? 'removed' :
block.type === 'added' ? 'added' : ''}
/>
))}
</div>
))}
</div>
</div>
)
}
export default DiffView
// const testDiff = `--- combined_before.txt 2025-06-24 16:38:08
// +++ combined_after.txt 2025-06-24 16:38:12
// @@ -1,21 +1,25 @@
// unchanged line
// -deleted line
// -old content
// +added line
// +new content
//
// -removed empty line below
// +added empty line above
//
// - tab indented
// -trailing spaces
// -very long line that will definitely wrap in most editors and cause potential alignment issues when displayed in a two column diff view
// -unicode content: 🚀 ✨ 中文
// -mixed content with tabs and spaces
// + space indented
// +no trailing spaces
// +short line
// +very long replacement line that will also wrap and test how the diff viewer handles long line additions after short line removals
// +different unicode: 🎉 💻 日本語
// +normalized content with consistent spacing
// +newline to content
//
// -content to remove
// -whitespace only:
// -multiple
// -consecutive
// -deletions
// -single deletion
// +
// +single addition
// +first addition
// +second addition
// +third addition
// line before addition
// +first added line
// +
// +third added line
// line after addition
// final unchanged line`