Skip to content
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.

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

Escape HTML attribute for fenced code blocks, in the info string; 2.0.3 #244

Merged
merged 2 commits into from
Apr 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
* Render element attributes in the order they were defined.
Aligns more closely with the strict spec definition.
* Correctly render `&` within inline image titles.
* Added 68 new GitHub emojis.
* Add 68 new GitHub emojis.
* Escape HTML attribute for fenced code blocks, in the info string.

## 2.0.2

Expand Down
9 changes: 7 additions & 2 deletions lib/src/block_parser.dart
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@ class FencedCodeBlockSyntax extends BlockSyntax {

var text = childLines.join('\n');
if (parser.document.encodeHtml) {
// Escape the code.
text = escapeHtml(text);
}
var code = Element.text('code', text);
Expand All @@ -454,7 +453,13 @@ class FencedCodeBlockSyntax extends BlockSyntax {
if (infoString.isNotEmpty) {
// only use the first word in the syntax
// http://spec.commonmark.org/0.22/#example-100
infoString = infoString.split(' ').first;
var firstSpace = infoString.indexOf(' ');
if (firstSpace >= 0) {
infoString = infoString.substring(0, firstSpace);
}
if (parser.document.encodeHtml) {
infoString = escapeHtmlAttribute(infoString);
}
code.attributes['class'] = "language-$infoString";
}

Expand Down
3 changes: 3 additions & 0 deletions lib/src/util.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import 'package:charcode/charcode.dart';
String escapeHtml(String html) =>
const HtmlEscape(HtmlEscapeMode.element).convert(html);

String escapeHtmlAttribute(String text) =>
const HtmlEscape(HtmlEscapeMode.attribute).convert(text);

// Escape the contents of [value], so that it may be used as an HTML attribute.

// Based on http://spec.commonmark.org/0.28/#backslash-escapes.
Expand Down
2 changes: 1 addition & 1 deletion lib/src/version.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: markdown
version: 2.0.3-dev
version: 2.0.3

description: A library for converting markdown to HTML.
author: Dart Team <[email protected]>
Expand Down
7 changes: 7 additions & 0 deletions test/markdown_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ void main() {
5 Ethernet ([Music](
''', '''
<p>5 Ethernet ([Music](</p>
''');

validateCore('Escaping code block language', '''
```"/><a/href="url">arbitrary_html</a>
```
''', '''
<pre><code class="language-&quot;/&gt;&lt;a/href=&quot;url&quot;&gt;arbitrary_html&lt;/a&gt;"></code></pre>
''');
});

Expand Down
2 changes: 1 addition & 1 deletion tool/common_mark_stats.json
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
"308": "strict",
"309": "fail",
"310": "fail",
"311": "loose",
"311": "fail",
"312": "strict",
"313": "strict"
},
Expand Down
4 changes: 2 additions & 2 deletions tool/common_mark_stats.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
22 of 25 – 88.0% Block quotes
16 of 17 – 94.1% Code spans
124 of 128 – 96.9% Emphasis and strong emphasis
10 of 12 – 83.3% Entity and numeric character references
9 of 12 – 75.0% Entity and numeric character references
25 of 28 – 89.3% Fenced code blocks
15 of 15 – 100.0% Hard line breaks
43 of 43 – 100.0% HTML blocks
Expand All @@ -24,4 +24,4 @@
11 of 11 – 100.0% Tabs
3 of 3 – 100.0% Textual content
19 of 19 – 100.0% Thematic breaks
580 of 624 – 92.9% TOTAL
579 of 624 – 92.8% TOTAL
2 changes: 1 addition & 1 deletion tool/gfm_stats.json
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
"321": "strict",
"322": "fail",
"323": "fail",
"324": "loose",
"324": "fail",
"325": "strict",
"326": "strict"
},
Expand Down
4 changes: 2 additions & 2 deletions tool/gfm_stats.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
20 of 21 – 95.2% Code spans
0 of 1 – 0.0% Disallowed Raw HTML (extension)
125 of 129 – 96.9% Emphasis and strong emphasis
10 of 12 – 83.3% Entity and numeric character references
9 of 12 – 75.0% Entity and numeric character references
25 of 28 – 89.3% Fenced code blocks
15 of 15 – 100.0% Hard line breaks
43 of 43 – 100.0% HTML blocks
Expand All @@ -28,4 +28,4 @@
11 of 11 – 100.0% Tabs
3 of 3 – 100.0% Textual content
19 of 19 – 100.0% Thematic breaks
601 of 654 – 91.9% TOTAL
600 of 654 – 91.7% TOTAL