Skip to content

Commit

Permalink
Merge pull request #632 from epage/mark
Browse files Browse the repository at this point in the history 
fix(md): Be more conformant
  • Loading branch information
@epage
epage committed Apr 7, 2019
2 parents c0f14ba + 3841da3 commit db10269
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 39 deletions.
35 changes: 21 additions & 14 deletions Cargo.lock
View file

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Expand Up @@ -31,7 +31,7 @@ log = "0.4"
env_logger = "0.6"
rss = "1.7"
jsonfeed = "0.2"
pulldown-cmark = {version="0.2", default-features = false}
pulldown-cmark = {version="0.4", default-features = false}
notify = "4.0"
ghp = "0.1"
regex = "1.1"
Expand Down
27 changes: 11 additions & 16 deletions src/syntax_highlight/syntect.rs
View file
@@ -1,4 +1,3 @@
use std::borrow::Cow::Owned;
use std::io::Write;

use itertools::Itertools;
Expand Down Expand Up @@ -164,7 +163,7 @@ impl<'a> Iterator for DecoratedParser<'a> {
let highlighted = &h.highlight(&text, &SETUP.syntax_set);
let html =
styled_line_to_highlighted_html(highlighted, IncludeBackground::Yes);
Some(Html(Owned(html)))
Some(Html(pulldown_cmark::CowStr::Boxed(html.into_boxed_str())))
} else {
Some(Text(text))
}
Expand All @@ -179,13 +178,17 @@ impl<'a> Iterator for DecoratedParser<'a> {
.unwrap_or_else(|| SETUP.syntax_set.find_syntax_plain_text());
self.h = Some(HighlightLines::new(cur_syntax, self.theme));
let snippet = start_highlighted_html_snippet(self.theme);
return Some(Html(Owned(snippet.0)));
return Some(Html(pulldown_cmark::CowStr::Boxed(
snippet.0.into_boxed_str(),
)));
}
if let End(cmark::Tag::CodeBlock(_)) = item {
// reset highlighter
self.h = None;
// close the code block
return Some(Html(Owned("</pre>".to_owned())));
return Some(Html(pulldown_cmark::CowStr::Boxed(
"</pre>".to_owned().into_boxed_str(),
)));
}

Some(item)
Expand Down Expand Up @@ -248,24 +251,16 @@ mod test {
const MARKDOWN_RENDERED: &str =
"<pre style=\"background-color:#2b303b;\">\n\
<span style=\"background-color:#2b303b;color:#b48ead;\">mod </span>\
<span style=\"background-color:#2b303b;color:#c0c5ce;\">test {\n\
</span><span style=\"background-color:#2b303b;color:#c0c5ce;\"> </span>\
<span style=\"background-color:#2b303b;color:#c0c5ce;\">test {\n </span>\
<span style=\"background-color:#2b303b;color:#b48ead;\">fn </span>\
<span style=\"background-color:#2b303b;color:#8fa1b3;\">hello</span>\
<span style=\"background-color:#2b303b;color:#c0c5ce;\">(</span>\
<span style=\"background-color:#2b303b;color:#bf616a;\">arg</span>\
<span style=\"background-color:#2b303b;color:#c0c5ce;\">: int) -&gt; </span>\
<span style=\"background-color:#2b303b;color:#b48ead;\">bool </span>\
<span style=\"background-color:#2b303b;color:#c0c5ce;\">{\n\
</span><span style=\"background-color:#2b303b;color:#c0c5ce;\"> </span>\
<span style=\"background-color:#2b303b;color:#d08770;\">true\n\
</span><span style=\"background-color:#2b303b;color:#c0c5ce;\"> </span>\
<span style=\"background-color:#2b303b;color:#c0c5ce;\">}\n\
</span><span style=\"background-color:#2b303b;color:#c0c5ce;\"> </span>\
<span style=\"background-color:#2b303b;color:#c0c5ce;\">}\n\
</span><span style=\"background-color:#2b303b;color:#c0c5ce;\"> </span>\
<span style=\"background-color:#2b303b;color:#c0c5ce;\">\n\
</span></pre>";
<span style=\"background-color:#2b303b;color:#c0c5ce;\">{\n </span>\
<span style=\"background-color:#2b303b;color:#d08770;\">true\n </span>\
<span style=\"background-color:#2b303b;color:#c0c5ce;\">}\n }\n \n</span></pre>";

#[test]
fn markdown_renders_rust() {
Expand Down
8 changes: 4 additions & 4 deletions tests/target/markdown_table/index.html
View file
Expand Up @@ -6,11 +6,11 @@
<body>
<h1>index.html</h1>

<table><thead><tr><th>test </th><th> test</th></tr></thead><tbody>
<tr><td>12</td><td> 123</td></tr>
<table><thead><tr><th>test </th><th>test</th></tr></thead><tbody>
<tr><td>12</td><td>123</td></tr>
</tbody></table>
<table><thead><tr><th>Header 1 </th><th> Header 2</th></tr></thead><tbody>
<tr><td>data 1 </td><td> data 2</td></tr>
<table><thead><tr><th>Header 1 </th><th>Header 2</th></tr></thead><tbody>
<tr><td>data 1 </td><td>data 2</td></tr>
</tbody></table>

</body>
Expand Down
4 changes: 2 additions & 2 deletions tests/target/syntax_highlight/rust.html
View file
Expand Up @@ -2,9 +2,9 @@
<pre style="background-color:#2b303b;">
<span style="background-color:#2b303b;color:#c0c5ce;">
</span><span style="background-color:#2b303b;color:#b48ead;">fn </span><span style="background-color:#2b303b;color:#8fa1b3;">hello</span><span style="background-color:#2b303b;color:#c0c5ce;">() -&gt; </span><span style="background-color:#2b303b;color:#b48ead;">bool </span><span style="background-color:#2b303b;color:#c0c5ce;">{
</span><span style="background-color:#2b303b;color:#c0c5ce;"> </span><span style="background-color:#2b303b;color:#d08770;">true
</span><span style="background-color:#2b303b;color:#d08770;">true
</span><span style="background-color:#2b303b;color:#c0c5ce;">}
</span><span style="background-color:#2b303b;color:#c0c5ce;">

</span></pre><pre style="background-color:#2b303b;">
<span style="color:#c0c5ce;">
</span><span style="color:#c0c5ce;">
Expand Down
4 changes: 2 additions & 2 deletions tests/target/syntax_highlight_theme/rust.html
View file
Expand Up @@ -2,9 +2,9 @@
<pre style="background-color:#fdf6e3;">
<span style="background-color:#fdf6e3;color:#657b83;">
</span><span style="background-color:#fdf6e3;color:#268bd2;">fn </span><span style="background-color:#fdf6e3;color:#b58900;">hello</span><span style="background-color:#fdf6e3;color:#657b83;">() -&gt; </span><span style="background-color:#fdf6e3;color:#268bd2;">bool </span><span style="background-color:#fdf6e3;color:#657b83;">{
</span><span style="background-color:#fdf6e3;color:#657b83;"> </span><span style="background-color:#fdf6e3;color:#b58900;">true
</span><span style="background-color:#fdf6e3;color:#b58900;">true
</span><span style="background-color:#fdf6e3;color:#657b83;">}
</span><span style="background-color:#fdf6e3;color:#657b83;">

</span></pre><pre style="background-color:#fdf6e3;">
<span style="color:#657b83;">
</span><span style="color:#657b83;">
Expand Down

0 comments on commit db10269

Please sign in to comment.