Page MenuHomestyx hydra
Files F128131

No OneTemporary
Actions

View Options

diff --git a/src/infrastructure/markup/blockrule/PhutilRemarkupInterpreterBlockRule.php b/src/infrastructure/markup/blockrule/PhutilRemarkupInterpreterBlockRule.php
index a54e6b8b13..5585ddf541 100644
--- a/src/infrastructure/markup/blockrule/PhutilRemarkupInterpreterBlockRule.php
+++ b/src/infrastructure/markup/blockrule/PhutilRemarkupInterpreterBlockRule.php
@@ -1,89 +1,111 @@
<?php
final class PhutilRemarkupInterpreterBlockRule extends PhutilRemarkupBlockRule {
- const START_BLOCK_PATTERN = '/^([\w]+)\s*(?:\(([^)]+)\)\s*)?{{{/';
+ /**
+ * Second part of the regex to find stuff like:
+ * interpreterName {{{ stuff }}}
+ * interpreterName (options) {{{ stuff }}}
+ * You have found the kernel of cowsay and figlet.
+ */
const END_BLOCK_PATTERN = '/}}}\s*$/';
+ /**
+ * Constructs the first part of the regex to find stuff like:
+ * interpreterName {{{ stuff }}}
+ * interpreterName (options) {{{ stuff }}}
+ * The exact regex is constructed from the available interpreters.
+ * @return string First part of interpreters regex
+ */
+ private function getStartBlockPattern() {
+ $interpreters = id(new PhutilClassMapQuery())
+ ->setAncestorClass('PhutilRemarkupBlockInterpreter')
+ ->execute();
+ $interpreters_regex = mpull($interpreters, 'getInterpreterName');
+ $interpreters_regex = array_map('preg_quote', $interpreters_regex);
+ $interpreters_regex = implode('|', $interpreters_regex);
+ return "/^($interpreters_regex)\s*(?:\(([^)]+)\)\s*)?{{{/";
+ }
+
public function getMatchingLineCount(array $lines, $cursor) {
$num_lines = 0;
- if (preg_match(self::START_BLOCK_PATTERN, $lines[$cursor])) {
+ if (preg_match(self::getStartBlockPattern(), $lines[$cursor])) {
$num_lines++;
while (isset($lines[$cursor])) {
if (preg_match(self::END_BLOCK_PATTERN, $lines[$cursor])) {
break;
}
$num_lines++;
$cursor++;
}
}
return $num_lines;
}
public function markupText($text, $children) {
$lines = explode("\n", $text);
$first_key = head_key($lines);
$last_key = last_key($lines);
while (trim($lines[$last_key]) === '') {
unset($lines[$last_key]);
$last_key = last_key($lines);
}
$matches = null;
- preg_match(self::START_BLOCK_PATTERN, head($lines), $matches);
+ preg_match(self::getStartBlockPattern(), head($lines), $matches);
$argv = array();
if (isset($matches[2])) {
$argv = id(new PhutilSimpleOptions())->parse($matches[2]);
}
$interpreters = id(new PhutilClassMapQuery())
->setAncestorClass('PhutilRemarkupBlockInterpreter')
->execute();
foreach ($interpreters as $interpreter) {
$interpreter->setEngine($this->getEngine());
}
$lines[$first_key] = preg_replace(
- self::START_BLOCK_PATTERN,
+ self::getStartBlockPattern(),
'',
$lines[$first_key]);
$lines[$last_key] = preg_replace(
self::END_BLOCK_PATTERN,
'',
$lines[$last_key]);
if (trim($lines[$first_key]) === '') {
unset($lines[$first_key]);
}
if (trim($lines[$last_key]) === '') {
unset($lines[$last_key]);
}
$content = implode("\n", $lines);
$interpreters = mpull($interpreters, null, 'getInterpreterName');
if (isset($interpreters[$matches[1]])) {
return $interpreters[$matches[1]]->markupContent($content, $argv);
}
$message = pht('No interpreter found: %s', $matches[1]);
if ($this->getEngine()->isTextMode()) {
return '('.$message.')';
}
return phutil_tag(
'div',
array(
'class' => 'remarkup-interpreter-error',
),
$message);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Wed, Apr 30, 12:33 AM (1 d, 7 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
108496
Default Alt Text
(3 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)