* Add line highlighting to code blocks * Fix highlighting of lines Apparently every line to be highlighted is provided in one chunk. * Add more documentation to codeblock.rs * Turn FenceIter into an Iterator * Move Range to fence.rs * Add tests
313 lines
7.2 KiB
Rust
313 lines
7.2 KiB
Rust
use std::collections::HashMap;
|
|
|
|
use tera::Tera;
|
|
|
|
use config::Config;
|
|
use front_matter::InsertAnchor;
|
|
use rendering::{render_content, RenderContext};
|
|
use templates::ZOLA_TERA;
|
|
use utils::slugs::SlugifyStrategy;
|
|
|
|
macro_rules! colored_html_line {
|
|
( @no $s:expr ) => {{
|
|
let mut result = "<span style=\"color:#c0c5ce;\">".to_string();
|
|
result.push_str($s);
|
|
result.push_str("\n</span>");
|
|
result
|
|
}};
|
|
( @hl $s:expr ) => {{
|
|
let mut result = "<span style=\"background-color:#65737e30;color:#c0c5ce;\">".to_string();
|
|
result.push_str($s);
|
|
result.push_str("\n</span>");
|
|
result
|
|
}};
|
|
}
|
|
|
|
macro_rules! colored_html {
|
|
( $(@$kind:tt $s:expr),* $(,)* ) => {{
|
|
let mut result = "<pre style=\"background-color:#2b303b;\">\n<code>".to_string();
|
|
$(
|
|
result.push_str(colored_html_line!(@$kind $s).as_str());
|
|
)*
|
|
result.push_str("</code></pre>");
|
|
result
|
|
}};
|
|
}
|
|
|
|
#[test]
|
|
fn hl_lines_simple() {
|
|
let tera_ctx = Tera::default();
|
|
let permalinks_ctx = HashMap::new();
|
|
let mut config = Config::default();
|
|
config.highlight_code = true;
|
|
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, InsertAnchor::None);
|
|
let res = render_content(r#"
|
|
```hl_lines=2
|
|
foo
|
|
bar
|
|
bar
|
|
baz
|
|
```
|
|
"#, &context).unwrap();
|
|
assert_eq!(res.body, colored_html!(
|
|
@no "foo",
|
|
@hl "bar",
|
|
@no "bar\nbaz",
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn hl_lines_in_middle() {
|
|
let tera_ctx = Tera::default();
|
|
let permalinks_ctx = HashMap::new();
|
|
let mut config = Config::default();
|
|
config.highlight_code = true;
|
|
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, InsertAnchor::None);
|
|
let res = render_content(r#"
|
|
```hl_lines=2-3
|
|
foo
|
|
bar
|
|
bar
|
|
baz
|
|
```
|
|
"#, &context).unwrap();
|
|
assert_eq!(res.body, colored_html!(
|
|
@no "foo",
|
|
@hl "bar\nbar",
|
|
@no "baz",
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn hl_lines_all() {
|
|
let tera_ctx = Tera::default();
|
|
let permalinks_ctx = HashMap::new();
|
|
let mut config = Config::default();
|
|
config.highlight_code = true;
|
|
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, InsertAnchor::None);
|
|
let res = render_content(r#"
|
|
```hl_lines=1-4
|
|
foo
|
|
bar
|
|
bar
|
|
baz
|
|
```
|
|
"#, &context).unwrap();
|
|
assert_eq!(res.body, colored_html!(
|
|
@hl "foo\nbar\nbar\nbaz",
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn hl_lines_start_from_one() {
|
|
let tera_ctx = Tera::default();
|
|
let permalinks_ctx = HashMap::new();
|
|
let mut config = Config::default();
|
|
config.highlight_code = true;
|
|
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, InsertAnchor::None);
|
|
let res = render_content(r#"
|
|
```hl_lines=1-3
|
|
foo
|
|
bar
|
|
bar
|
|
baz
|
|
```
|
|
"#, &context).unwrap();
|
|
assert_eq!(res.body, colored_html!(
|
|
@hl "foo\nbar\nbar",
|
|
@no "baz",
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn hl_lines_start_from_zero() {
|
|
let tera_ctx = Tera::default();
|
|
let permalinks_ctx = HashMap::new();
|
|
let mut config = Config::default();
|
|
config.highlight_code = true;
|
|
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, InsertAnchor::None);
|
|
let res = render_content(r#"
|
|
```hl_lines=0-3
|
|
foo
|
|
bar
|
|
bar
|
|
baz
|
|
```
|
|
"#, &context).unwrap();
|
|
assert_eq!(res.body, colored_html!(
|
|
@hl "foo\nbar\nbar",
|
|
@no "baz",
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn hl_lines_end() {
|
|
let tera_ctx = Tera::default();
|
|
let permalinks_ctx = HashMap::new();
|
|
let mut config = Config::default();
|
|
config.highlight_code = true;
|
|
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, InsertAnchor::None);
|
|
let res = render_content(r#"
|
|
```hl_lines=3-4
|
|
foo
|
|
bar
|
|
bar
|
|
baz
|
|
```
|
|
"#, &context).unwrap();
|
|
assert_eq!(res.body, colored_html!(
|
|
@no "foo\nbar",
|
|
@hl "bar\nbaz",
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn hl_lines_end_out_of_bounds() {
|
|
let tera_ctx = Tera::default();
|
|
let permalinks_ctx = HashMap::new();
|
|
let mut config = Config::default();
|
|
config.highlight_code = true;
|
|
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, InsertAnchor::None);
|
|
let res = render_content(r#"
|
|
```hl_lines=3-4294967295
|
|
foo
|
|
bar
|
|
bar
|
|
baz
|
|
```
|
|
"#, &context).unwrap();
|
|
assert_eq!(res.body, colored_html!(
|
|
@no "foo\nbar",
|
|
@hl "bar\nbaz",
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn hl_lines_overlap() {
|
|
let tera_ctx = Tera::default();
|
|
let permalinks_ctx = HashMap::new();
|
|
let mut config = Config::default();
|
|
config.highlight_code = true;
|
|
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, InsertAnchor::None);
|
|
let res = render_content(r#"
|
|
```hl_lines=2-3 1-2
|
|
foo
|
|
bar
|
|
bar
|
|
baz
|
|
```
|
|
"#, &context).unwrap();
|
|
assert_eq!(res.body, colored_html!(
|
|
@hl "foo\nbar\nbar",
|
|
@no "baz",
|
|
));
|
|
}
|
|
#[test]
|
|
fn hl_lines_multiple() {
|
|
let tera_ctx = Tera::default();
|
|
let permalinks_ctx = HashMap::new();
|
|
let mut config = Config::default();
|
|
config.highlight_code = true;
|
|
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, InsertAnchor::None);
|
|
let res = render_content(r#"
|
|
```hl_lines=2-3,hl_lines=1-2
|
|
foo
|
|
bar
|
|
bar
|
|
baz
|
|
```
|
|
"#, &context).unwrap();
|
|
assert_eq!(res.body, colored_html!(
|
|
@hl "foo\nbar\nbar",
|
|
@no "baz",
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn hl_lines_extra_spaces() {
|
|
let tera_ctx = Tera::default();
|
|
let permalinks_ctx = HashMap::new();
|
|
let mut config = Config::default();
|
|
config.highlight_code = true;
|
|
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, InsertAnchor::None);
|
|
let res = render_content(r#"
|
|
``` hl_lines = 2 - 3 1 - 2
|
|
foo
|
|
bar
|
|
bar
|
|
baz
|
|
```
|
|
"#, &context).unwrap();
|
|
assert_eq!(res.body, colored_html!(
|
|
@hl "foo\nbar\nbar",
|
|
@no "baz",
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn hl_lines_int_and_range() {
|
|
let tera_ctx = Tera::default();
|
|
let permalinks_ctx = HashMap::new();
|
|
let mut config = Config::default();
|
|
config.highlight_code = true;
|
|
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, InsertAnchor::None);
|
|
let res = render_content(r#"
|
|
```hl_lines=1 3-4
|
|
foo
|
|
bar
|
|
bar
|
|
baz
|
|
```
|
|
"#, &context).unwrap();
|
|
assert_eq!(res.body, colored_html!(
|
|
@hl "foo",
|
|
@no "bar",
|
|
@hl "bar\nbaz",
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn hl_lines_single_line_range() {
|
|
let tera_ctx = Tera::default();
|
|
let permalinks_ctx = HashMap::new();
|
|
let mut config = Config::default();
|
|
config.highlight_code = true;
|
|
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, InsertAnchor::None);
|
|
let res = render_content(r#"
|
|
```hl_lines=2-2
|
|
foo
|
|
bar
|
|
bar
|
|
baz
|
|
```
|
|
"#, &context).unwrap();
|
|
assert_eq!(res.body, colored_html!(
|
|
@no "foo",
|
|
@hl "bar",
|
|
@no "bar\nbaz",
|
|
));
|
|
}
|
|
|
|
|
|
#[test]
|
|
fn hl_lines_reverse_range() {
|
|
let tera_ctx = Tera::default();
|
|
let permalinks_ctx = HashMap::new();
|
|
let mut config = Config::default();
|
|
config.highlight_code = true;
|
|
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, InsertAnchor::None);
|
|
let res = render_content(r#"
|
|
```hl_lines=3-2
|
|
foo
|
|
bar
|
|
bar
|
|
baz
|
|
```
|
|
"#, &context).unwrap();
|
|
assert_eq!(res.body, colored_html!(
|
|
@no "foo",
|
|
@hl "bar\nbar",
|
|
@no "baz",
|
|
));
|
|
}
|