Skip to content

Remove leftover parseSourceDiff from ace editor #3101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 16, 2025
Merged

Remove leftover parseSourceDiff from ace editor #3101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 0 additions & 25 deletions webapp/src/Twig/TwigExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,31 +912,6 @@ public function codeEditor(
sprintf($editor, $code, $editable ? 'false' : 'true', $mode, $extraForEdit));
}

// This function expects $difftext to be in unified diff format. In
// particular each line is expected to contain at least some character
// (that is, a leading space, + or -) so that strtok does not gobble up
// multiple empty lines in one go.
protected function parseSourceDiff(string $difftext): string
{
$line = strtok($difftext, "\n"); // first line
$return = '';
while ($line !== false) {
// Strip any additional DOS/MAC newline characters:
$line = str_replace("\r", "↵", $line);
$formdiffline = match (substr($line, 0, 1)) {
'-' => "<span class='diff-del'>" . htmlspecialchars($line) . "</span>",
'+' => "<span class='diff-add'>" . htmlspecialchars($line) . "</span>",
default => htmlspecialchars($line),
};
if (str_contains($formdiffline, '#Warning: Strings contain different line endings')) {
$formdiffline = "<span class='diff-endline'>$formdiffline</span>";
}
$return .= $formdiffline . "\n";
$line = strtok("\n");
}
return $return;
}

public function showDiff(string $id, SubmissionFile $newFile, SubmissionFile $oldFile): string
{
$editor = <<<HTML
Expand Down
Loading