Skip to content

Commit a940604

Browse files
fix(source-control): preserve Markdown examples during merge cleanup
1 parent 24a93ca commit a940604

2 files changed

Lines changed: 29 additions & 4 deletions

File tree

‎apps/server/src/pullRequest/mergeMessage.test.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,21 @@ describe("removeAgentCredits", () => {
4848
);
4949
});
5050

51+
it.each(["``` text ```", " ```", "\t~~~"])(
52+
"removes trailers after a line that cannot open a fence: %s",
53+
(line) => {
54+
expect(removeAgentCredits(`${line}\n\nCo-authored-by: Claude <[email protected]>`)).toBe(
55+
line,
56+
);
57+
},
58+
);
59+
60+
it.each(["```", "~~~"])("keeps examples after a false closing fence: %s", (fence) => {
61+
const example = "Co-authored-by: Claude <[email protected]>";
62+
const content = `${fence}text\n${fence} trailing text\n${example}\n ${fence}\n${example}\n${fence.slice(0, 2)}\n${example}\n ${fence}${fence[0]} \t`;
63+
expect(removeAgentCredits(`${content}\n\n${example}`)).toBe(content);
64+
});
65+
5166
it("preserves CRLF line endings", () => {
5267
expect(
5368
removeAgentCredits(

‎apps/server/src/pullRequest/mergeMessage.ts‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,23 @@ export function removeAgentCredits(message: string): string {
1717
let removed = false;
1818
const newline = message.includes("\r\n") ? "\r\n" : "\n";
1919
const lines = message.split(/\r?\n/).filter((line) => {
20-
const marker = /^\s*(`{3,}|~{3,})/.exec(line)?.[1];
20+
if (/^(?: {4}|\t)/.test(line)) return true;
21+
const delimiter = /^ {0,3}(`{3,}|~{3,})(.*)$/.exec(line);
22+
const marker = delimiter?.[1];
23+
const remainder = delimiter?.[2] ?? "";
2124
if (marker !== undefined) {
22-
if (fence === undefined) fence = marker;
23-
else if (marker[0] === fence[0] && marker.length >= fence.length) fence = undefined;
25+
if (fence === undefined) {
26+
if (marker[0] === "~" || !remainder.includes("`")) fence = marker;
27+
} else if (
28+
marker[0] === fence[0] &&
29+
marker.length >= fence.length &&
30+
/^[ \t]*$/.test(remainder)
31+
) {
32+
fence = undefined;
33+
}
2434
return true;
2535
}
26-
if (fence !== undefined || /^(?: {4}|\t)/.test(line)) return true;
36+
if (fence !== undefined) return true;
2737
const text = line.trim().replace(/^(?:[-*]\s+)/, "");
2838
const author = /^co-authored-by:\s*(.*?)\s*<([^<>]+)>\s*$/i.exec(text);
2939
// GitHub's generic noreply address is also used by people; require Copilot's name.

0 commit comments

Comments
 (0)