Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions apps/diffshub/components/usePatchLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import {
areSelectionsEqual,
type CodeViewItem,
type CodeViewLineSelection,
processFile,
getStreamedPatchMetadata,
processFileBytes,
streamGitPatchFiles,
} from '@pierre/diffs';
import { type CodeViewHandle, useStableCallback } from '@pierre/diffs/react';
import {
Expand Down Expand Up @@ -32,10 +34,6 @@ import {
formatDiffsHubLineHash,
parseDiffsHubLineHash,
} from '@/lib/lineHash';
import {
getStreamedPatchMetadata,
streamGitPatchFiles,
} from '@/lib/streamGitPatchFiles';
import type {
CommentMetadata,
DiffsHubCommentFileByItemId,
Expand Down Expand Up @@ -404,20 +402,20 @@ export function usePatchLoader({

publishTreeSource();
};
const appendStreamedFile = async (fileText: string) => {
const appendStreamedFile = async (fileBytes: Uint8Array) => {
if (!hasReceivedFirstStreamedFile) {
hasReceivedFirstStreamedFile = true;
}

const patchMetadata = getStreamedPatchMetadata(fileText);
const patchMetadata = getStreamedPatchMetadata(fileBytes);
if (patchMetadata != null) {
streamTreePathPrefix = getPatchTreePathPrefix(
patchMetadata,
streamPatchIndex++
);
}

const fileDiff = processFile(fileText, {
const fileDiff = processFileBytes(fileBytes, {
cacheKey: `${cacheKeyPrefix}-0-${accumulator.fileIndex}`,
isGitDiff: true,
});
Expand Down
2 changes: 1 addition & 1 deletion apps/diffshub/lib/gitPatchMetadata.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const COMMIT_HASH_METADATA_PATTERN = /^From\s+([a-f0-9]+)\s/im;
import { COMMIT_HASH_METADATA_PATTERN } from '@pierre/diffs';

const commitPrefixEncoder = new TextEncoder();
const commitPrefixDecoder = new TextDecoder();
Expand Down
243 changes: 0 additions & 243 deletions apps/diffshub/lib/streamGitPatchFiles.ts

This file was deleted.

3 changes: 2 additions & 1 deletion packages/diffs/src/editor/editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import type {
SelectionSide,
TextEdit,
} from '../types';
import { joinLines } from '../utils/diffLines';
import { getFiletypeFromFileName } from '../utils/getFiletypeFromFileName';
import { isGutterUtilityPath } from '../utils/isGutterUtilityPath';
import {
Expand Down Expand Up @@ -905,7 +906,7 @@ export class Editor<LAnnotation> implements DiffsEditor<LAnnotation> {
if ('contents' in fileOrDiff) {
contents = fileOrDiff.contents;
} else {
contents = fileOrDiff.additionLines.join('');
contents = joinLines(fileOrDiff.additionLines);
}
const editStack = new EditStack<LAnnotation>({
maxEntries: this.#options.historyMaxEntries,
Expand Down
2 changes: 2 additions & 0 deletions packages/diffs/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export * from './utils/createWindowFromScrollPosition';
export * from './utils/cssWrappers';
export * from './utils/detachString';
export * from './utils/diffAcceptRejectHunk';
export * from './utils/diffLines';
export * from './utils/formatCSSVariablePrefix';
export * from './utils/getFiletypeFromFileName';
export * from './utils/getHighlighterOptions';
Expand All @@ -99,6 +100,7 @@ export * from './utils/parseDiffDecorations';
export * from './utils/parseDiffFromFile';
export * from './utils/parseLineType';
export * from './utils/parsePatchFiles';
export * from './utils/parsePatchStream';
export * from './utils/prefersReducedMotion';
export * from './utils/prerenderHTMLIfNecessary';
export * from './utils/processLine';
Expand Down
Loading