diff options
| author | Eric Huss <eric@huss.org> | 2019-09-07 12:21:32 -0700 |
|---|---|---|
| committer | Eric Huss <eric@huss.org> | 2019-09-07 12:21:32 -0700 |
| commit | fb387088e2e327e4060290edc92a90d49669b04c (patch) | |
| tree | fb84379f7ff2516c5c51a4c191ef9ebd4689e4a0 | |
| parent | ef54f57c5b9d894a38179d09b00610c1b337b086 (diff) | |
| download | rust-fb387088e2e327e4060290edc92a90d49669b04c.tar.gz rust-fb387088e2e327e4060290edc92a90d49669b04c.zip | |
rustdoc: fix diagnostic with mixed code block styles
| -rw-r--r-- | src/librustdoc/html/markdown.rs | 5 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/invalid-syntax.rs | 8 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/invalid-syntax.stderr | 18 |
3 files changed, 30 insertions, 1 deletions
diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs index 74413a7f905..8bf01d2cc1a 100644 --- a/src/librustdoc/html/markdown.rs +++ b/src/librustdoc/html/markdown.rs @@ -931,7 +931,10 @@ crate fn rust_code_blocks(md: &str) -> Vec<RustCodeBlock> { is_fenced = true; previous_offset + fence_idx } - None => offset, + None => { + is_fenced = false; + offset + } }; } } diff --git a/src/test/rustdoc-ui/invalid-syntax.rs b/src/test/rustdoc-ui/invalid-syntax.rs index 3ef66e273d0..97a0f4aaec1 100644 --- a/src/test/rustdoc-ui/invalid-syntax.rs +++ b/src/test/rustdoc-ui/invalid-syntax.rs @@ -74,3 +74,11 @@ pub fn empty_rust() {} /// /// ``` pub fn empty_rust_with_whitespace() {} + +/// ``` +/// let x = 1; +/// ``` +/// +/// \____/ +/// +pub fn indent_after_fenced() {} diff --git a/src/test/rustdoc-ui/invalid-syntax.stderr b/src/test/rustdoc-ui/invalid-syntax.stderr index 36209e29277..6f50edae650 100644 --- a/src/test/rustdoc-ui/invalid-syntax.stderr +++ b/src/test/rustdoc-ui/invalid-syntax.stderr @@ -202,6 +202,24 @@ LL | /// ```text | ^^^^^^^ error: unknown start of token: \ + --> <doctest>:1:1 + | +1 | \____/ + | ^ + +warning: could not parse code block as Rust code + --> $DIR/invalid-syntax.rs:82:9 + | +LL | /// \____/ + | ^^^^^^ + +error: unknown start of token: \ + --> <rustdoc-highlighting>:1:1 + | +1 | \____/ + | ^ + +error: unknown start of token: \ --> <rustdoc-highlighting>:1:1 | 1 | \_ |