Skip to content

Commit 14d56e1

Browse files
authored
fix(server): preserve byte-order marks in Git diff contents (#23421)
1 parent e92981d commit 14d56e1

2 files changed

Lines changed: 23 additions & 2 deletions

File tree

‎apps/server/src/vcs/GitVcsDriverCore.test.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2536,6 +2536,27 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
25362536
}),
25372537
);
25382538

2539+
it.effect.each([
2540+
{ scenario: "kept", before: "\uFEFFold\n", after: "\uFEFFnew\n" },
2541+
{ scenario: "added", before: "same\n", after: "\uFEFFsame\n" },
2542+
{ scenario: "removed", before: "\uFEFFsame\n", after: "same\n" },
2543+
])("preserves byte-order marks in diff expansion when $scenario", ({ before, after }) =>
2544+
Effect.gen(function* () {
2545+
const cwd = yield* makeTmpDir();
2546+
yield* initRepoWithCommit(cwd);
2547+
yield* writeTextFile(cwd, "README.md", before);
2548+
yield* git(cwd, ["commit", "-am", "write original contents"]);
2549+
yield* writeTextFile(cwd, "README.md", after);
2550+
const driver = yield* GitVcsDriver.GitVcsDriver;
2551+
2552+
const contents = yield* driver.getReviewDiffFileContents(
2553+
makeReviewDiffFileContentsInput(cwd),
2554+
);
2555+
2556+
assert.deepStrictEqual(contents, { oldContents: before, newContents: after });
2557+
}),
2558+
);
2559+
25392560
it.effect("reads a base ref that looks like an option as a revision", () =>
25402561
Effect.gen(function* () {
25412562
const cwd = yield* makeTmpDir();

‎apps/server/src/vcs/GitVcsDriverCore.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ const collectOutput = Effect.fnUntraced(function* (
844844
onLine: ((line: string) => Effect.Effect<void, never>) | undefined,
845845
keepLineCallbacksAfterTruncation = false,
846846
): Effect.fn.Return<{ readonly text: string; readonly truncated: boolean }, GitCommandError> {
847-
const decoder = new TextDecoder();
847+
const decoder = new TextDecoder("utf-8", { ignoreBOM: true });
848848
const lineDecoder = keepLineCallbacksAfterTruncation && onLine ? new TextDecoder() : null;
849849
let bytes = 0;
850850
let text = "";
@@ -3562,7 +3562,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
35623562
if (bytes.includes(0)) {
35633563
return yield* fileError("fs.readFile", `Cannot expand binary file '${input.newPath}'.`);
35643564
}
3565-
return new TextDecoder("utf-8").decode(bytes);
3565+
return new TextDecoder("utf-8", { ignoreBOM: true }).decode(bytes);
35663566
});
35673567

35683568
const getReviewDiffFileContents = Effect.fn("getReviewDiffFileContents")(function* (

0 commit comments

Comments
 (0)