diffity 0.1.0 → 0.1.2

package/packages/ui/src/components/general-comments.tsx

@@ -1,174 +0,0 @@
-import { useState } from 'react';
-import { GENERAL_THREAD_FILE_PATH, isThreadResolved } from '../types/comment';
-import type { CommentAuthor, CommentThread as CommentThreadType } from '../types/comment';
-import type { CommentActions } from '../hooks/use-comment-actions';
-import { CommentBubble } from './comment-bubble';
-import { CommentForm } from './comment-form';
-import { CommentIcon } from './icons/comment-icon';
-import { TrashIcon } from './icons/trash-icon';
-import { ThreadBadge } from './ui/thread-badge';
-
-const DEFAULT_AUTHOR: CommentAuthor = { name: 'You', type: 'user' };
-
-interface GeneralCommentsProps {
-  threads: CommentThreadType[];
-  commentActions: CommentActions;
-}
-
-export function GeneralComments(props: GeneralCommentsProps) {
-  const { threads: allThreads, commentActions } = props;
-
-  const threads = allThreads.filter(t => t.filePath === GENERAL_THREAD_FILE_PATH);
-  const [isExpanded, setIsExpanded] = useState(threads.length > 0);
-  const [showForm, setShowForm] = useState(false);
-
-  return (
-    <div className={`border rounded-lg mx-4 mt-4 overflow-hidden ${threads.length > 0 ? 'border-accent/40' : 'border-border'}`}>
-      <div className={`flex items-center gap-2 px-3 py-2 text-sm select-none ${threads.length > 0 ? 'bg-accent/5' : 'bg-bg-secondary'}`}>
-        <button
-          onClick={() => setIsExpanded(!isExpanded)}
-          className="text-[10px] w-5 h-5 shrink-0 flex items-center justify-center text-text-muted cursor-pointer"
-        >
-          {isExpanded ? '\u25bc' : '\u25b6'}
-        </button>
-        <button
-          onClick={() => setIsExpanded(!isExpanded)}
-          className="flex items-center gap-2 cursor-pointer"
-        >
-          <CommentIcon className="w-3.5 h-3.5 text-text-muted" />
-          <span className="text-text-secondary">General comments</span>
-          {threads.length > 0 && (
-            <span className="text-xs font-medium bg-accent/15 text-accent px-1.5 py-0.5 rounded-full">{threads.length}</span>
-          )}
-        </button>
-        <div className="flex-1" />
-        <button
-          onClick={(e) => {
-            e.stopPropagation();
-            setIsExpanded(true);
-            setShowForm(true);
-          }}
-          className="text-xs text-accent hover:text-accent-hover transition-colors cursor-pointer"
-        >
-          Add comment
-        </button>
-      </div>
-      {isExpanded && (
-        <div className="border-t border-border bg-bg">
-          {showForm && (
-            <div className="p-3">
-              <CommentForm
-                onSubmit={(body) => {
-                  commentActions.addThread(GENERAL_THREAD_FILE_PATH, 'new', 0, 0, body, DEFAULT_AUTHOR);
-                  setShowForm(false);
-                }}
-                onCancel={() => setShowForm(false)}
-                placeholder="Leave a general comment..."
-                submitLabel="Comment"
-              />
-            </div>
-          )}
-          {threads.length > 0 ? (
-            <div className="p-3 space-y-3">
-              {threads.map((thread) => (
-                <GeneralThreadCard
-                  key={thread.id}
-                  thread={thread}
-                  onReply={(body) => commentActions.addReply(thread.id, body, DEFAULT_AUTHOR)}
-                  onResolve={() => commentActions.resolveThread(thread.id)}
-                  onUnresolve={() => commentActions.unresolveThread(thread.id)}
-                  onDeleteComment={(commentId) => commentActions.deleteComment(thread.id, commentId)}
-                  onDeleteThread={() => commentActions.deleteThread(thread.id)}
-                />
-              ))}
-            </div>
-          ) : !showForm && (
-            <div className="px-3 py-4 text-center text-xs text-text-muted">
-              No general comments yet
-            </div>
-          )}
-        </div>
-      )}
-    </div>
-  );
-}
-
-interface GeneralThreadCardProps {
-  thread: CommentThreadType;
-  onReply: (body: string) => void;
-  onResolve: () => void;
-  onUnresolve: () => void;
-  onDeleteComment: (commentId: string) => void;
-  onDeleteThread: () => void;
-}
-
-function GeneralThreadCard(props: GeneralThreadCardProps) {
-  const { thread, onReply, onResolve, onUnresolve, onDeleteComment, onDeleteThread } = props;
-  const [showReply, setShowReply] = useState(false);
-  const resolved = isThreadResolved(thread);
-
-  return (
-    <div className="border border-border rounded-lg overflow-hidden">
-      <div className="flex items-center justify-between px-3 py-1.5 bg-bg-secondary border-b border-border">
-        <div className="flex items-center gap-2">
-          {resolved && <ThreadBadge variant="resolved" />}
-        </div>
-        <div className="flex items-center gap-1">
-          {resolved ? (
-            <button
-              onClick={onUnresolve}
-              className="text-[11px] text-text-muted hover:text-text-secondary transition-colors cursor-pointer"
-            >
-              Reopen
-            </button>
-          ) : (
-            <button
-              onClick={onResolve}
-              className="text-[11px] text-text-muted hover:text-text-secondary transition-colors cursor-pointer"
-            >
-              Resolve
-            </button>
-          )}
-          <button
-            onClick={onDeleteThread}
-            className="text-text-muted hover:text-deleted transition-colors cursor-pointer ml-1"
-            title="Delete thread"
-          >
-            <TrashIcon className="w-3.5 h-3.5" />
-          </button>
-        </div>
-      </div>
-      <div>
-        {thread.comments.map((comment) => (
-          <CommentBubble
-            key={comment.id}
-            comment={comment}
-            onDelete={() => onDeleteComment(comment.id)}
-          />
-        ))}
-      </div>
-      {showReply ? (
-        <div className="px-3 py-2 border-t border-border">
-          <CommentForm
-            onSubmit={(body) => {
-              onReply(body);
-              setShowReply(false);
-            }}
-            onCancel={() => setShowReply(false)}
-            placeholder="Reply..."
-            submitLabel="Reply"
-          />
-        </div>
-      ) : (
-        <div className="px-3 py-2 border-t border-border">
-          <button
-            onClick={() => setShowReply(true)}
-            className="text-xs text-accent hover:text-accent-hover transition-colors cursor-pointer"
-          >
-            Reply
-          </button>
-        </div>
-      )}
-    </div>
-  );
-}

package/packages/ui/src/components/hunk-block-split.tsx

@@ -1,357 +0,0 @@
-import { useState, useMemo } from 'react';
-import type { DiffHunk, DiffLine as DiffLineType } from '@diffity/parser';
-import { cn } from '../lib/cn';
-import { getLineBg, getChangeGroups } from '../lib/diff-utils';
-import { renderContent } from '../lib/render-content';
-import type { SyntaxToken } from '../lib/syntax-token';
-import type { CommentThread as CommentThreadType, CommentAuthor, CommentSide, LineSelection, LineRenderProps } from '../types/comment';
-import { HunkHeader, type ExpandControls } from './hunk-header';
-import { CommentLineNumber } from './comment-line-number';
-import { CommentThread } from './comment-thread';
-import { CommentFormRow } from './comment-form-row';
-import { UndoIcon } from './icons/undo-icon';
-
-interface HunkBlockSplitProps {
-  hunk: DiffHunk;
-  syntaxMap?: Map<string, SyntaxToken[]>;
-  expandControls?: ExpandControls;
-  topExpansionLines?: DiffLineType[];
-  bottomExpansionLines?: DiffLineType[];
-  expansionSyntaxMap?: Map<string, SyntaxToken[]>;
-  threads?: CommentThreadType[];
-  pendingSelection?: LineSelection | null;
-  currentAuthor?: CommentAuthor;
-  isLineSelected?: (line: number, side: CommentSide) => boolean;
-  onLineMouseDown?: (line: number, side: CommentSide) => void;
-  onLineMouseEnter?: (line: number, side: CommentSide) => void;
-  onCommentClick?: (line: number, side: CommentSide) => void;
-  onAddThread?: (filePath: string, side: CommentSide, startLine: number, endLine: number, body: string, author: CommentAuthor) => void;
-  onReply?: (threadId: string, body: string, author: CommentAuthor) => void;
-  onResolve?: (threadId: string) => void;
-  onUnresolve?: (threadId: string) => void;
-  onDeleteComment?: (threadId: string, commentId: string) => void;
-  onDeleteThread?: (threadId: string) => void;
-  onCancelPending?: () => void;
-  filePath?: string;
-  onRevertChange?: (hunk: DiffHunk, startIndex: number, endIndex: number) => void;
-  getOriginalCode?: (side: CommentSide, startLine: number, endLine: number) => string;
-}
-
-interface SplitRow {
-  left: DiffLineType | null;
-  right: DiffLineType | null;
-}
-
-function buildSplitRows(lines: DiffLineType[]): SplitRow[] {
-  const rows: SplitRow[] = [];
-  let i = 0;
-
-  while (i < lines.length) {
-    const line = lines[i];
-
-    if (line.type === 'context') {
-      rows.push({ left: line, right: line });
-      i++;
-      continue;
-    }
-
-    if (line.type === 'delete') {
-      const deleteLines: DiffLineType[] = [];
-      while (i < lines.length && lines[i].type === 'delete') {
-        deleteLines.push(lines[i]);
-        i++;
-      }
-
-      const addLines: DiffLineType[] = [];
-      while (i < lines.length && lines[i].type === 'add') {
-        addLines.push(lines[i]);
-        i++;
-      }
-
-      const maxLen = Math.max(deleteLines.length, addLines.length);
-      for (let j = 0; j < maxLen; j++) {
-        rows.push({
-          left: j < deleteLines.length ? deleteLines[j] : null,
-          right: j < addLines.length ? addLines[j] : null,
-        });
-      }
-      continue;
-    }
-
-    if (line.type === 'add') {
-      rows.push({ left: null, right: line });
-      i++;
-      continue;
-    }
-
-    i++;
-  }
-
-  return rows;
-}
-
-function getCellBg(line: DiffLineType | null): string {
-  if (!line) {
-    return 'bg-bg-secondary';
-  }
-  return getLineBg(line.type);
-}
-
-function getSyntaxKey(line: DiffLineType): string {
-  const num = line.type === 'delete' ? line.oldLineNumber : line.newLineNumber;
-  return `${line.type}-${num}`;
-}
-
-function SplitCell(props: {
-  line: DiffLineType | null;
-  side: 'left' | 'right';
-  syntaxMap?: Map<string, SyntaxToken[]>;
-  expanded?: boolean;
-  isSelected?: boolean;
-  onMouseDown?: () => void;
-  onMouseEnter?: () => void;
-  onCommentClick?: () => void;
-  onUndo?: () => void;
-}) {
-  const { line, side, syntaxMap, expanded, isSelected, onMouseDown, onMouseEnter, onCommentClick, onUndo } = props;
-  const [contentHovered, setContentHovered] = useState(false);
-
-  if (!line) {
-    return (
-      <>
-        <CommentLineNumber lineNumber={null} className="diff-empty-cell" />
-        <td className="px-3 whitespace-pre border-r border-border-muted align-top diff-empty-cell"></td>
-      </>
-    );
-  }
-
-  const bgClass = expanded ? 'bg-diff-expanded-gutter' : getCellBg(line);
-  const contentBgClass = expanded ? 'bg-diff-expanded-bg' : getCellBg(line);
-  const lineNum = side === 'left' ? line.oldLineNumber : line.newLineNumber;
-  const syntaxKey = getSyntaxKey(line);
-  const tokens = syntaxMap?.get(syntaxKey);
-
-  return (
-    <>
-      <CommentLineNumber
-        lineNumber={lineNum}
-        className={bgClass}
-        isSelected={isSelected}
-        showCommentButton={!!onCommentClick && lineNum !== null}
-        forceShowButton={contentHovered}
-        onMouseDown={onMouseDown}
-        onMouseEnter={onMouseEnter}
-        onCommentClick={onCommentClick}
-      />
-      <td
-        className={cn('px-3 whitespace-pre-wrap break-all border-r border-border-muted align-top relative', isSelected ? 'bg-diff-comment-bg' : contentBgClass)}
-        onMouseEnter={() => setContentHovered(true)}
-        onMouseLeave={() => setContentHovered(false)}
-      >
-        <span className="inline">{renderContent(line, tokens)}</span>
-        {onUndo && (
-          <button
-            onClick={onUndo}
-            className="absolute right-2 top-1/2 -translate-y-1/2 flex items-center gap-1 px-2 py-0.5 text-xs rounded bg-deleted/15 text-deleted hover:bg-deleted/25 transition-colors cursor-pointer opacity-0 group-hover/split-row:opacity-100"
-            title="Undo this change"
-          >
-            <UndoIcon className="w-3 h-3" />
-            Undo
-          </button>
-        )}
-      </td>
-    </>
-  );
-}
-
-export function renderSplitRows(
-  lines: DiffLineType[],
-  expanded: boolean,
-  syntaxMap: Map<string, SyntaxToken[]> | undefined,
-  keyPrefix: string,
-  props: LineRenderProps,
-  undoForRow?: Map<number, () => void>,
-): React.ReactNode[] {
-  const splitRows = buildSplitRows(lines);
-  const result: React.ReactNode[] = [];
-
-  for (let i = 0; i < splitRows.length; i++) {
-    const row = splitRows[i];
-    const leftLine = row.left;
-    const rightLine = row.right;
-    const leftNum = leftLine?.oldLineNumber ?? null;
-    const rightNum = rightLine?.newLineNumber ?? null;
-    const onUndo = undoForRow?.get(i);
-
-    result.push(
-      <tr key={`${keyPrefix}-${i}`} className="group/split-row font-mono text-sm leading-6">
-        <SplitCell
-          line={leftLine}
-          side="left"
-          syntaxMap={syntaxMap}
-          expanded={expanded}
-          isSelected={leftNum !== null ? props.isLineSelected?.(leftNum, 'old') : false}
-          onMouseDown={leftNum !== null ? () => props.onLineMouseDown?.(leftNum, 'old') : undefined}
-          onMouseEnter={leftNum !== null ? () => props.onLineMouseEnter?.(leftNum, 'old') : undefined}
-          onCommentClick={leftNum !== null && props.onCommentClick ? () => props.onCommentClick!(leftNum, 'old') : undefined}
-          onUndo={onUndo && !rightLine ? onUndo : undefined}
-        />
-        <SplitCell
-          line={rightLine}
-          side="right"
-          syntaxMap={syntaxMap}
-          expanded={expanded}
-          isSelected={rightNum !== null ? props.isLineSelected?.(rightNum, 'new') : false}
-          onMouseDown={rightNum !== null ? () => props.onLineMouseDown?.(rightNum, 'new') : undefined}
-          onMouseEnter={rightNum !== null ? () => props.onLineMouseEnter?.(rightNum, 'new') : undefined}
-          onCommentClick={rightNum !== null && props.onCommentClick ? () => props.onCommentClick!(rightNum, 'new') : undefined}
-          onUndo={onUndo && rightLine ? onUndo : undefined}
-        />
-      </tr>
-    );
-
-    const threadRows: React.ReactNode[] = [];
-
-    if (leftNum !== null && props.threads) {
-      const leftThreads = props.threads.filter(t => t.endLine === leftNum && t.side === 'old');
-      for (const thread of leftThreads) {
-        threadRows.push(
-          <CommentThread
-            key={`thread-${thread.id}`}
-            thread={thread}
-            onReply={props.onReply!}
-            onResolve={props.onResolve!}
-            onUnresolve={props.onUnresolve!}
-            onDeleteComment={props.onDeleteComment!}
-            onDeleteThread={props.onDeleteThread!}
-            currentAuthor={props.currentAuthor!}
-            colSpan={2}
-            viewMode="split"
-            side="old"
-            currentCode={props.getOriginalCode?.(thread.side, thread.startLine, thread.endLine)}
-          />
-        );
-      }
-    }
-
-    if (rightNum !== null && props.threads) {
-      const rightThreads = props.threads.filter(t => t.endLine === rightNum && t.side === 'new');
-      for (const thread of rightThreads) {
-        threadRows.push(
-          <CommentThread
-            key={`thread-${thread.id}`}
-            thread={thread}
-            onReply={props.onReply!}
-            onResolve={props.onResolve!}
-            onUnresolve={props.onUnresolve!}
-            onDeleteComment={props.onDeleteComment!}
-            onDeleteThread={props.onDeleteThread!}
-            currentAuthor={props.currentAuthor!}
-            colSpan={2}
-            viewMode="split"
-            side="new"
-            currentCode={props.getOriginalCode?.(thread.side, thread.startLine, thread.endLine)}
-          />
-        );
-      }
-    }
-
-    if (props.pendingSelection && props.filePath && props.currentAuthor && props.onAddThread && props.onCancelPending) {
-      const showForLeft = leftNum !== null && props.pendingSelection.endLine === leftNum && props.pendingSelection.side === 'old';
-      const showForRight = rightNum !== null && props.pendingSelection.endLine === rightNum && props.pendingSelection.side === 'new';
-      if (showForLeft || showForRight) {
-        threadRows.push(
-          <CommentFormRow
-            key="pending-comment"
-            colSpan={2}
-            filePath={props.filePath}
-            side={props.pendingSelection.side}
-            startLine={props.pendingSelection.startLine}
-            endLine={props.pendingSelection.endLine}
-            currentAuthor={props.currentAuthor}
-            onSubmit={props.onAddThread}
-            onCancel={props.onCancelPending}
-            viewMode="split"
-          />
-        );
-      }
-    }
-
-    if (threadRows.length > 0) {
-      result.push(...threadRows);
-    }
-  }
-
-  return result;
-}
-
-export function HunkBlockSplit(props: HunkBlockSplitProps) {
-  const {
-    hunk, syntaxMap, expandControls, topExpansionLines, bottomExpansionLines, expansionSyntaxMap,
-    threads, pendingSelection, currentAuthor, isLineSelected,
-    onLineMouseDown, onLineMouseEnter, onCommentClick,
-    onAddThread, onReply, onResolve, onUnresolve, onDeleteComment, onDeleteThread,
-    onCancelPending, filePath, onRevertChange, getOriginalCode,
-  } = props;
-
-  const commentProps = {
-    isLineSelected, onLineMouseDown, onLineMouseEnter, onCommentClick,
-    threads, pendingSelection, currentAuthor,
-    onAddThread, onReply, onResolve, onUnresolve, onDeleteComment, onDeleteThread,
-    onCancelPending, filePath, getOriginalCode,
-  };
-
-  const undoForRow = useMemo(() => {
-    if (!onRevertChange) {
-      return undefined;
-    }
-    const groups = getChangeGroups(hunk.lines);
-    const splitRows = buildSplitRows(hunk.lines);
-    const map = new Map<number, () => void>();
-
-    for (const group of groups) {
-      let lastSplitRowIdx = -1;
-      for (let ri = 0; ri < splitRows.length; ri++) {
-        const row = splitRows[ri];
-        const leftIsChange = row.left && row.left.type !== 'context';
-        const rightIsChange = row.right && row.right.type !== 'context';
-        if (leftIsChange || rightIsChange) {
-          const nextRow = splitRows[ri + 1];
-          const nextIsContext = !nextRow || ((!nextRow.left || nextRow.left.type === 'context') && (!nextRow.right || nextRow.right.type === 'context'));
-          if (nextIsContext) {
-            const leftInGroup = row.left && row.left.type !== 'context' && hunk.lines.indexOf(row.left) >= group.startIndex && hunk.lines.indexOf(row.left) <= group.endIndex;
-            const rightInGroup = row.right && row.right.type !== 'context' && hunk.lines.indexOf(row.right) >= group.startIndex && hunk.lines.indexOf(row.right) <= group.endIndex;
-            if (leftInGroup || rightInGroup) {
-              lastSplitRowIdx = ri;
-            }
-          }
-        }
-      }
-      if (lastSplitRowIdx >= 0) {
-        const g = group;
-        map.set(lastSplitRowIdx, () => onRevertChange(hunk, g.startIndex, g.endIndex));
-      }
-    }
-
-    return map;
-  }, [hunk, onRevertChange]);
-
-  const rows: React.ReactNode[] = [];
-
-  if (topExpansionLines && topExpansionLines.length > 0) {
-    rows.push(...renderSplitRows(topExpansionLines, true, expansionSyntaxMap, 'top-exp', commentProps));
-  }
-
-  if (bottomExpansionLines && bottomExpansionLines.length > 0) {
-    rows.push(...renderSplitRows(bottomExpansionLines, true, expansionSyntaxMap, 'bot-exp', commentProps));
-  }
-
-  rows.push(...renderSplitRows(hunk.lines, false, syntaxMap, 'hunk', commentProps, undoForRow));
-
-  return (
-    <tbody className={expandControls?.wasExpanded && expandControls.remainingLines <= 0 ? '' : 'border-t border-border-muted'}>
-      <HunkHeader hunk={hunk} expandControls={expandControls} />
-      {rows}
-    </tbody>
-  );
-}

package/packages/ui/src/components/hunk-block.tsx

@@ -1,161 +0,0 @@
-import { useMemo } from 'react';
-import type { DiffHunk, DiffLine as DiffLineType } from '@diffity/parser';
-import type { SyntaxToken } from '../lib/syntax-token';
-import type { CommentThread as CommentThreadType, CommentAuthor, CommentSide, LineSelection, LineRenderProps } from '../types/comment';
-import { getChangeGroups } from '../lib/diff-utils';
-import { DiffLine } from './diff-line';
-import { HunkHeader, type ExpandControls } from './hunk-header';
-import { CommentThread } from './comment-thread';
-import { CommentFormRow } from './comment-form-row';
-
-interface HunkBlockProps {
-  hunk: DiffHunk;
-  syntaxMap?: Map<string, SyntaxToken[]>;
-  expandControls?: ExpandControls;
-  topExpansionLines?: DiffLineType[];
-  bottomExpansionLines?: DiffLineType[];
-  expansionSyntaxMap?: Map<string, SyntaxToken[]>;
-  threads?: CommentThreadType[];
-  pendingSelection?: LineSelection | null;
-  currentAuthor?: CommentAuthor;
-  isLineSelected?: (line: number, side: CommentSide) => boolean;
-  onLineMouseDown?: (line: number, side: CommentSide) => void;
-  onLineMouseEnter?: (line: number, side: CommentSide) => void;
-  onCommentClick?: (line: number, side: CommentSide) => void;
-  onAddThread?: (filePath: string, side: CommentSide, startLine: number, endLine: number, body: string, author: CommentAuthor) => void;
-  onReply?: (threadId: string, body: string, author: CommentAuthor) => void;
-  onResolve?: (threadId: string) => void;
-  onUnresolve?: (threadId: string) => void;
-  onDeleteComment?: (threadId: string, commentId: string) => void;
-  onDeleteThread?: (threadId: string) => void;
-  onCancelPending?: () => void;
-  filePath?: string;
-  onRevertChange?: (hunk: DiffHunk, startIndex: number, endIndex: number) => void;
-  getOriginalCode?: (side: CommentSide, startLine: number, endLine: number) => string;
-}
-
-export function renderLineWithComments(
-  line: DiffLineType,
-  index: number,
-  expanded: boolean,
-  syntaxMap: Map<string, SyntaxToken[]> | undefined,
-  props: LineRenderProps,
-  onUndo?: () => void,
-): React.ReactNode[] {
-  const side: CommentSide = line.type === 'delete' ? 'old' : 'new';
-  const activeLine = side === 'old' ? line.oldLineNumber : line.newLineNumber;
-  const num = activeLine;
-  const key = num !== null ? `${expanded ? 'exp-' : ''}${line.type}-${num}` : `line-${index}`;
-  const syntaxKey = num !== null ? `${line.type}-${num}` : '';
-  const tokens = syntaxMap?.get(syntaxKey);
-
-  const result: React.ReactNode[] = [];
-
-  result.push(
-    <DiffLine
-      key={key}
-      line={line}
-      syntaxTokens={tokens}
-      expanded={expanded}
-      isSelected={activeLine !== null ? props.isLineSelected?.(activeLine, side) : false}
-      onLineMouseDown={props.onLineMouseDown}
-      onLineMouseEnter={props.onLineMouseEnter}
-      onCommentClick={props.onCommentClick}
-      onUndo={onUndo}
-    />
-  );
-
-  if (activeLine !== null && props.threads) {
-    const lineThreads = props.threads.filter(t => t.endLine === activeLine && t.side === side);
-    for (const thread of lineThreads) {
-      result.push(
-        <CommentThread
-          key={`thread-${thread.id}`}
-          thread={thread}
-          onReply={props.onReply!}
-          onResolve={props.onResolve!}
-          onUnresolve={props.onUnresolve!}
-          onDeleteComment={props.onDeleteComment!}
-          onDeleteThread={props.onDeleteThread!}
-          currentAuthor={props.currentAuthor!}
-          colSpan={4}
-          currentCode={props.getOriginalCode?.(thread.side, thread.startLine, thread.endLine)}
-        />
-      );
-    }
-  }
-
-  if (activeLine !== null && props.pendingSelection && props.pendingSelection.endLine === activeLine && props.pendingSelection.side === side && props.filePath && props.currentAuthor && props.onAddThread && props.onCancelPending) {
-    result.push(
-      <CommentFormRow
-        key="pending-comment"
-        colSpan={4}
-        filePath={props.filePath}
-        side={props.pendingSelection.side}
-        startLine={props.pendingSelection.startLine}
-        endLine={props.pendingSelection.endLine}
-        currentAuthor={props.currentAuthor}
-        onSubmit={props.onAddThread}
-        onCancel={props.onCancelPending}
-      />
-    );
-  }
-
-  return result;
-}
-
-export function HunkBlock(props: HunkBlockProps) {
-  const {
-    hunk, syntaxMap, expandControls, topExpansionLines, bottomExpansionLines, expansionSyntaxMap,
-    threads, pendingSelection, currentAuthor, isLineSelected,
-    onLineMouseDown, onLineMouseEnter, onCommentClick,
-    onAddThread, onReply, onResolve, onUnresolve, onDeleteComment, onDeleteThread,
-    onCancelPending, filePath, onRevertChange, getOriginalCode,
-  } = props;
-
-  const commentProps = {
-    isLineSelected, onLineMouseDown, onLineMouseEnter, onCommentClick,
-    threads, pendingSelection, currentAuthor,
-    onAddThread, onReply, onResolve, onUnresolve, onDeleteComment, onDeleteThread,
-    onCancelPending, filePath, getOriginalCode,
-  };
-
-  const changeGroupEnds = useMemo(() => {
-    if (!onRevertChange) {
-      return new Map<number, { startIndex: number; endIndex: number }>();
-    }
-    const groups = getChangeGroups(hunk.lines);
-    const map = new Map<number, { startIndex: number; endIndex: number }>();
-    for (const group of groups) {
-      map.set(group.endIndex, group);
-    }
-    return map;
-  }, [hunk.lines, onRevertChange]);
-
-  const rows: React.ReactNode[] = [];
-
-  if (topExpansionLines) {
-    for (let i = 0; i < topExpansionLines.length; i++) {
-      rows.push(...renderLineWithComments(topExpansionLines[i], i, true, expansionSyntaxMap, commentProps));
-    }
-  }
-
-  if (bottomExpansionLines) {
-    for (let i = 0; i < bottomExpansionLines.length; i++) {
-      rows.push(...renderLineWithComments(bottomExpansionLines[i], i, true, expansionSyntaxMap, commentProps));
-    }
-  }
-
-  for (let i = 0; i < hunk.lines.length; i++) {
-    const group = changeGroupEnds.get(i);
-    const onUndo = group ? () => onRevertChange!(hunk, group.startIndex, group.endIndex) : undefined;
-    rows.push(...renderLineWithComments(hunk.lines[i], i, false, syntaxMap, commentProps, onUndo));
-  }
-
-  return (
-    <tbody className={expandControls?.wasExpanded && expandControls.remainingLines <= 0 ? '' : 'border-t border-border-muted'}>
-      <HunkHeader hunk={hunk} expandControls={expandControls} />
-      {rows}
-    </tbody>
-  );
-}