Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13236466
D9756.id23423.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
18 KB
Referenced Files
None
Subscribers
None
D9756.id23423.diff
View Options
diff --git a/src/markup/engine/__tests__/remarkup/headers.txt b/src/markup/engine/__tests__/remarkup/headers.txt
--- a/src/markup/engine/__tests__/remarkup/headers.txt
+++ b/src/markup/engine/__tests__/remarkup/headers.txt
@@ -20,19 +20,19 @@
~~~~~~~~~~
<p>@nolint (UTF8)</p>
-<h2>a</h2>
+<h2 class="remarkup-header">a</h2>
<p>blah blah blah</p>
-<h2>b</h2>
+<h2 class="remarkup-header">b</h2>
-<h2>Markdown-Style Large Header</h2>
+<h2 class="remarkup-header">Markdown-Style Large Header</h2>
-<h3>Markdown-Style Small Header</h3>
+<h3 class="remarkup-header">Markdown-Style Small Header</h3>
-<h4>Remarkup-Style Smaller Header</h4>
+<h4 class="remarkup-header">Remarkup-Style Smaller Header</h4>
-<h2>☃☃☃ UTF8 Header ☃☃☃</h2>
+<h2 class="remarkup-header">☃☃☃ UTF8 Header ☃☃☃</h2>
~~~~~~~~~~
@nolint (UTF8)
diff --git a/src/markup/engine/__tests__/remarkup/horizonal-rule.txt b/src/markup/engine/__tests__/remarkup/horizonal-rule.txt
--- a/src/markup/engine/__tests__/remarkup/horizonal-rule.txt
+++ b/src/markup/engine/__tests__/remarkup/horizonal-rule.txt
@@ -10,26 +10,26 @@
- - - - - - -
~~~~~~~~~~
-<hr />
+<hr class="remarkup-hr" />
-<hr />
+<hr class="remarkup-hr" />
-<hr />
+<hr class="remarkup-hr" />
-<hr />
+<hr class="remarkup-hr" />
-<hr />
+<hr class="remarkup-hr" />
-<hr />
+<hr class="remarkup-hr" />
~~~~~~~~~~
-<hr />
+<hr class="remarkup-hr" />
-<hr />
+<hr class="remarkup-hr" />
-<hr />
+<hr class="remarkup-hr" />
-<hr />
+<hr class="remarkup-hr" />
-<hr />
+<hr class="remarkup-hr" />
-<hr />
+<hr class="remarkup-hr" />
diff --git a/src/markup/engine/__tests__/remarkup/list-alternate-style.txt b/src/markup/engine/__tests__/remarkup/list-alternate-style.txt
--- a/src/markup/engine/__tests__/remarkup/list-alternate-style.txt
+++ b/src/markup/engine/__tests__/remarkup/list-alternate-style.txt
@@ -2,10 +2,10 @@
-- b
--- c
~~~~~~~~~~
-<ul>
-<li>a<ul>
-<li>b<ul>
-<li>c</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">b<ul class="remarkup-list">
+<li class="remarkup-list-item">c</li>
</ul></li>
</ul></li>
</ul>
diff --git a/src/markup/engine/__tests__/remarkup/list-blow-stack.txt b/src/markup/engine/__tests__/remarkup/list-blow-stack.txt
--- a/src/markup/engine/__tests__/remarkup/list-blow-stack.txt
+++ b/src/markup/engine/__tests__/remarkup/list-blow-stack.txt
@@ -40,45 +40,45 @@
derp
~~~~~~~~~~
-<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
</ul></li>
</ul></li>
</ul></li>
diff --git a/src/markup/engine/__tests__/remarkup/list-checkboxes.txt b/src/markup/engine/__tests__/remarkup/list-checkboxes.txt
--- a/src/markup/engine/__tests__/remarkup/list-checkboxes.txt
+++ b/src/markup/engine/__tests__/remarkup/list-checkboxes.txt
@@ -9,18 +9,18 @@
[ ] D
~~~~~~~~~~
-<ul class="remarkup-list-with-checkmarks">
-<li class="remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> a</li>
-<li class="remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> b</li>
-<li class="remarkup-checked-item"><input type="checkbox" checked="checked" disabled="disabled" /> c</li>
-<li>d</li>
+<ul class="remarkup-list remarkup-list-with-checkmarks">
+<li class="remarkup-list-item remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> a</li>
+<li class="remarkup-list-item remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> b</li>
+<li class="remarkup-list-item remarkup-checked-item"><input type="checkbox" checked="checked" disabled="disabled" /> c</li>
+<li class="remarkup-list-item">d</li>
</ul>
-<ul class="remarkup-list-with-checkmarks">
-<li class="remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> A</li>
-<li class="remarkup-checked-item"><input type="checkbox" checked="checked" disabled="disabled" /> B<ul class="remarkup-list-with-checkmarks">
-<li class="remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> C</li>
-<li class="remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> D</li>
+<ul class="remarkup-list remarkup-list-with-checkmarks">
+<li class="remarkup-list-item remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> A</li>
+<li class="remarkup-list-item remarkup-checked-item"><input type="checkbox" checked="checked" disabled="disabled" /> B<ul class="remarkup-list remarkup-list-with-checkmarks">
+<li class="remarkup-list-item remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> C</li>
+<li class="remarkup-list-item remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> D</li>
</ul></li>
</ul>
~~~~~~~~~~
diff --git a/src/markup/engine/__tests__/remarkup/list-first-style-wins.txt b/src/markup/engine/__tests__/remarkup/list-first-style-wins.txt
--- a/src/markup/engine/__tests__/remarkup/list-first-style-wins.txt
+++ b/src/markup/engine/__tests__/remarkup/list-first-style-wins.txt
@@ -4,10 +4,10 @@
derp
~~~~~~~~~~
-<ol>
-<li>item</li>
-<li>item</li>
-<li>item</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item">item</li>
+<li class="remarkup-list-item">item</li>
+<li class="remarkup-list-item">item</li>
</ol>
<p>derp</p>
diff --git a/src/markup/engine/__tests__/remarkup/list-hash.txt b/src/markup/engine/__tests__/remarkup/list-hash.txt
--- a/src/markup/engine/__tests__/remarkup/list-hash.txt
+++ b/src/markup/engine/__tests__/remarkup/list-hash.txt
@@ -4,10 +4,10 @@
derp
~~~~~~~~~~
-<ol>
-<li>item</li>
-<li>item</li>
-<li>item</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item">item</li>
+<li class="remarkup-list-item">item</li>
+<li class="remarkup-list-item">item</li>
</ol>
<p>derp</p>
diff --git a/src/markup/engine/__tests__/remarkup/list-mixed-styles.txt b/src/markup/engine/__tests__/remarkup/list-mixed-styles.txt
--- a/src/markup/engine/__tests__/remarkup/list-mixed-styles.txt
+++ b/src/markup/engine/__tests__/remarkup/list-mixed-styles.txt
@@ -2,10 +2,10 @@
-- b
--- c
~~~~~~~~~~
-<ul>
-<li>a<ul>
-<li>b<ul>
-<li>c</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">b<ul class="remarkup-list">
+<li class="remarkup-list-item">c</li>
</ul></li>
</ul></li>
</ul>
diff --git a/src/markup/engine/__tests__/remarkup/list-multi.txt b/src/markup/engine/__tests__/remarkup/list-multi.txt
--- a/src/markup/engine/__tests__/remarkup/list-multi.txt
+++ b/src/markup/engine/__tests__/remarkup/list-multi.txt
@@ -2,10 +2,10 @@
-- b
-- c
~~~~~~~~~~
-<ul>
-<li>a<ul>
-<li>b</li>
-<li>c</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">b</li>
+<li class="remarkup-list-item">c</li>
</ul></li>
</ul>
~~~~~~~~~~
diff --git a/src/markup/engine/__tests__/remarkup/list-multiline.txt b/src/markup/engine/__tests__/remarkup/list-multiline.txt
--- a/src/markup/engine/__tests__/remarkup/list-multiline.txt
+++ b/src/markup/engine/__tests__/remarkup/list-multiline.txt
@@ -3,9 +3,9 @@
- b
b
~~~~~~~~~~
-<ul>
-<li>a a</li>
-<li>b</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">a a</li>
+<li class="remarkup-list-item">b</li>
</ul>
<p>b</p>
diff --git a/src/markup/engine/__tests__/remarkup/list-nest.txt b/src/markup/engine/__tests__/remarkup/list-nest.txt
--- a/src/markup/engine/__tests__/remarkup/list-nest.txt
+++ b/src/markup/engine/__tests__/remarkup/list-nest.txt
@@ -7,15 +7,15 @@
derp
~~~~~~~~~~
-<ul>
-<li>item<ul>
-<li>sub</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">item<ul class="remarkup-list">
+<li class="remarkup-list-item">sub</li>
</ul></li>
-<li>item<ol>
-<li>sub</li>
-<li>sub</li>
+<li class="remarkup-list-item">item<ol class="remarkup-list">
+<li class="remarkup-list-item">sub</li>
+<li class="remarkup-list-item">sub</li>
</ol></li>
-<li>item</li>
+<li class="remarkup-list-item">item</li>
</ul>
<p>derp</p>
diff --git a/src/markup/engine/__tests__/remarkup/list-staircase.txt b/src/markup/engine/__tests__/remarkup/list-staircase.txt
--- a/src/markup/engine/__tests__/remarkup/list-staircase.txt
+++ b/src/markup/engine/__tests__/remarkup/list-staircase.txt
@@ -4,14 +4,14 @@
derp
~~~~~~~~~~
-<ol>
-<li class="phantom-item"><ul>
-<li class="phantom-item"><ul>
-<li>top</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item phantom-item"><ul class="remarkup-list">
+<li class="remarkup-list-item phantom-item"><ul class="remarkup-list">
+<li class="remarkup-list-item">top</li>
</ul></li>
-<li>mid</li>
+<li class="remarkup-list-item">mid</li>
</ul></li>
-<li>bot</li>
+<li class="remarkup-list-item">bot</li>
</ol>
<p>derp</p>
diff --git a/src/markup/engine/__tests__/remarkup/list-star.txt b/src/markup/engine/__tests__/remarkup/list-star.txt
--- a/src/markup/engine/__tests__/remarkup/list-star.txt
+++ b/src/markup/engine/__tests__/remarkup/list-star.txt
@@ -4,10 +4,10 @@
derp
~~~~~~~~~~
-<ul>
-<li>item</li>
-<li>item</li>
-<li>item</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">item</li>
+<li class="remarkup-list-item">item</li>
+<li class="remarkup-list-item">item</li>
</ul>
<p>derp</p>
diff --git a/src/markup/engine/__tests__/remarkup/list-then-a-list.txt b/src/markup/engine/__tests__/remarkup/list-then-a-list.txt
--- a/src/markup/engine/__tests__/remarkup/list-then-a-list.txt
+++ b/src/markup/engine/__tests__/remarkup/list-then-a-list.txt
@@ -2,12 +2,12 @@
- a
~~~~~~~~~~
-<ol>
-<li>one</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item">one</li>
</ol>
-<ul>
-<li>a</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">a</li>
</ul>
~~~~~~~~~~
1. one
diff --git a/src/markup/engine/__tests__/remarkup/list-vs-codeblock.txt b/src/markup/engine/__tests__/remarkup/list-vs-codeblock.txt
--- a/src/markup/engine/__tests__/remarkup/list-vs-codeblock.txt
+++ b/src/markup/engine/__tests__/remarkup/list-vs-codeblock.txt
@@ -6,9 +6,9 @@
~~~~~~~~~~
<p>This should be a list:</p>
-<ul>
-<li>apple</li>
-<li>banana</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">apple</li>
+<li class="remarkup-list-item">banana</li>
</ul>
~~~~~~~~~~
This should be a list:
diff --git a/src/markup/engine/__tests__/remarkup/list.txt b/src/markup/engine/__tests__/remarkup/list.txt
--- a/src/markup/engine/__tests__/remarkup/list.txt
+++ b/src/markup/engine/__tests__/remarkup/list.txt
@@ -2,8 +2,8 @@
text block
~~~~~~~~~~
-<ul>
-<li>< > & "</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">< > & "</li>
</ul>
<p>text block</p>
diff --git a/src/markup/engine/__tests__/remarkup/ordered-list-with-numbers.txt b/src/markup/engine/__tests__/remarkup/ordered-list-with-numbers.txt
--- a/src/markup/engine/__tests__/remarkup/ordered-list-with-numbers.txt
+++ b/src/markup/engine/__tests__/remarkup/ordered-list-with-numbers.txt
@@ -12,23 +12,23 @@
1/ This explicitly should not be formatted as a list.
~~~~~~~~~~
-<ol>
-<li>aasdx</li>
-<li>asdf</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item">aasdx</li>
+<li class="remarkup-list-item">asdf</li>
</ol>
-<ol>
-<li>asa<ol>
-<li>asdf</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item">asa<ol class="remarkup-list">
+<li class="remarkup-list-item">asdf</li>
</ol></li>
-<li>asdf</li>
+<li class="remarkup-list-item">asdf</li>
</ol>
<p>234) asd</p>
-<ol>
-<li>asd</li>
-<li>asd</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item">asd</li>
+<li class="remarkup-list-item">asd</li>
</ol>
<p>1/ This explicitly should not be formatted as a list.</p>
diff --git a/src/markup/engine/__tests__/remarkup/reply-nested.txt b/src/markup/engine/__tests__/remarkup/reply-nested.txt
--- a/src/markup/engine/__tests__/remarkup/reply-nested.txt
+++ b/src/markup/engine/__tests__/remarkup/reply-nested.txt
@@ -15,18 +15,18 @@
~~~~~~~~~~
<blockquote class="remarkup-reply-block">
<div class="remarkup-reply-head">Previously, fruit:</div>
-<div class="remarkup-reply-body"><ul>
-<li>Apple</li>
-<li>Banana</li>
-<li>Cherry</li>
+<div class="remarkup-reply-body"><ul class="remarkup-list">
+<li class="remarkup-list-item">Apple</li>
+<li class="remarkup-list-item">Banana</li>
+<li class="remarkup-list-item">Cherry</li>
</ul>
<blockquote class="remarkup-reply-block">
<div class="remarkup-reply-head">More previously, vegetables:</div>
-<div class="remarkup-reply-body"><ul>
-<li>Potato</li>
-<li>Potato</li>
-<li>Potato</li>
+<div class="remarkup-reply-body"><ul class="remarkup-list">
+<li class="remarkup-list-item">Potato</li>
+<li class="remarkup-list-item">Potato</li>
+<li class="remarkup-list-item">Potato</li>
</ul></div>
</blockquote>
diff --git a/src/markup/engine/__tests__/remarkup/toc.txt b/src/markup/engine/__tests__/remarkup/toc.txt
--- a/src/markup/engine/__tests__/remarkup/toc.txt
+++ b/src/markup/engine/__tests__/remarkup/toc.txt
@@ -13,11 +13,11 @@
<li><a href="#http-www-example-com">http://www.example.com</a></li>
</ul>
-<h2><a name="http-www-example-com-lin"></a><a href="http://www.example.com/" target="_blank" rel="noreferrer">link_name</a></h2>
+<h2 class="remarkup-header"><a name="http-www-example-com-lin"></a><a href="http://www.example.com/" target="_blank" rel="noreferrer">link_name</a></h2>
-<h3><a name="bold"></a><strong>bold</strong></h3>
+<h3 class="remarkup-header"><a name="bold"></a><strong>bold</strong></h3>
-<h2><a name="http-www-example-com"></a><a href="http://www.example.com" target="_blank" rel="noreferrer">http://www.example.com</a></h2>
+<h2 class="remarkup-header"><a name="http-www-example-com"></a><a href="http://www.example.com" target="_blank" rel="noreferrer">http://www.example.com</a></h2>
~~~~~~~~~~
[[ http://www.example.com/ | link_name ]]
=========================================
diff --git a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHeaderBlockRule.php b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHeaderBlockRule.php
--- a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHeaderBlockRule.php
+++ b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHeaderBlockRule.php
@@ -68,7 +68,9 @@
$text = phutil_tag(
'h'.($level + 1),
- array(),
+ array(
+ 'class' => 'remarkup-header',
+ ),
array($anchor, $this->applyRules($text)));
return $text;
diff --git a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHorizontalRuleBlockRule.php b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHorizontalRuleBlockRule.php
--- a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHorizontalRuleBlockRule.php
+++ b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHorizontalRuleBlockRule.php
@@ -30,7 +30,7 @@
}
public function markupText($text, $children) {
- return phutil_tag('hr', array());
+ return phutil_tag('hr', array('class' => 'remarkup-hr'));
}
diff --git a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupListBlockRule.php b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupListBlockRule.php
--- a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupListBlockRule.php
+++ b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupListBlockRule.php
@@ -397,9 +397,13 @@
}
if ($has_marks) {
- $out[] = hsprintf('<%s class="remarkup-list-with-checkmarks">', $tag);
+ $out[] = hsprintf(
+ '<%s class="remarkup-list remarkup-list-with-checkmarks">',
+ $tag);
} else {
- $out[] = hsprintf('<%s>', $tag);
+ $out[] = hsprintf(
+ '<%s class="remarkup-list">',
+ $tag);
}
$out[] = "\n";
@@ -428,13 +432,15 @@
}
$out[] = $this->applyRules($item['text'])."\n";
} else if ($item['text'] === null) {
- $out[] = hsprintf('<li class="phantom-item">');
+ $out[] = hsprintf('<li class="remarkup-list-item phantom-item">');
} else {
if ($item['mark'] !== null) {
if ($item['mark'] == true) {
- $out[] = hsprintf('<li class="remarkup-checked-item">');
+ $out[] = hsprintf(
+ '<li class="remarkup-list-item remarkup-checked-item">');
} else {
- $out[] = hsprintf('<li class="remarkup-unchecked-item">');
+ $out[] = hsprintf(
+ '<li class="remarkup-list-item remarkup-unchecked-item">');
}
$out[] = phutil_tag(
'input',
@@ -445,7 +451,7 @@
));
$out[] = ' ';
} else {
- $out[] = hsprintf('<li>');
+ $out[] = hsprintf('<li class="remarkup-list-item">');
}
$out[] = $this->applyRules($item['text']);
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, May 22, 9:49 AM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6295839
Default Alt Text
D9756.id23423.diff (18 KB)
Attached To
Mode
D9756: Add classes to Remarkup lists and headers
Attached
Detach File
Event Timeline
Log In to Comment