Skip to content

[BUGFIX] Survive a null or unknown code language #18

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

Open
davidsteeb wants to merge 2 commits into
base: master
Choose a base branch
from
+18 −3
Open

[BUGFIX] Survive a null or unknown code language #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3db6d6b
[BUGFIX] Treat a null code language as autodetect
davidsteeb Sep 23, 2026
3542388
[BUGFIX] Fall back to autodetect on unknown language
davidsteeb Sep 24, 2026
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
21 changes: 18 additions & 3 deletions Classes/DataProcessing/HighlightProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,28 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
$targetVariableName = $cObj->stdWrapValue('as', $processorConfiguration, 'bodytext_formatted');
$highlight = GeneralUtility::makeInstance(Highlighter::class);

// The column is nullable, so a record can carry NULL rather than the empty
// string the TCA default writes. Normalise before deciding, because "??"
// only substitutes for NULL and would send it on to the highlighter.
$language = trim((string)($processedData['data']['code_language'] ?? ''));

$highlighted = null;
if ($language !== '') {
try {
$highlighted = $highlight->highlight($language, $processedData['data'][$fieldName]);
} catch (\DomainException $e) {
// The stored language is not registered - it may have been dropped from
// the list, or the record may come from an installation that had it.
// Detect instead, so a stale value does not take the page down.
$highlighted = null;
}
}

// Let highlight.php decide which code language to use from all registered if "detect automatically" is selected.
if (!($processedData['data']['code_language'] ?? true)) {
if ($highlighted === null) {
$languages = $highlight->listLanguages();
$highlight->setAutodetectLanguages($languages);
$highlighted = $highlight->highlightAuto($processedData['data'][$fieldName]);
} else {
$highlighted = $highlight->highlight($processedData['data']['code_language'], $processedData['data'][$fieldName]);
}

$processedData[$targetVariableName]['code'] = $highlighted->value;
Expand Down