diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2021-01-03 17:09:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 17:09:01 +0100 |
| commit | 2686daa7791865d7970fba2b9d6e6db279666a41 (patch) | |
| tree | b4c100285b7fa8e271f16feb3ba6af74ea0cacbb /src/librustdoc/html | |
| parent | bcd69750794b315d7c673351f86cacdf5232a0b7 (diff) | |
| parent | 7bc1eb4506170e0750de4757af97f341c427a35a (diff) | |
| download | rust-2686daa7791865d7970fba2b9d6e6db279666a41.tar.gz rust-2686daa7791865d7970fba2b9d6e6db279666a41.zip | |
Rollup merge of #80580 - GuillaumeGomez:suggestion-ignore-codeblock-warn, r=jyn514
Add suggestion for "ignore" doc code block Part of https://github.com/rust-lang/rust/issues/30032. This PR adds a suggestion to help users when they have a "ignore" doc code block which is invalid rust code. r? `@jyn514`
Diffstat (limited to 'src/librustdoc/html')
| -rw-r--r-- | src/librustdoc/html/markdown.rs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs index 07744139605..0a8c89f6caf 100644 --- a/src/librustdoc/html/markdown.rs +++ b/src/librustdoc/html/markdown.rs @@ -1193,6 +1193,7 @@ crate struct RustCodeBlock { crate code: Range<usize>, crate is_fenced: bool, crate syntax: Option<String>, + crate is_ignore: bool, } /// Returns a range of bytes for each code block in the markdown that is tagged as `rust` or @@ -1208,7 +1209,7 @@ crate fn rust_code_blocks(md: &str, extra_info: &ExtraInfo<'_, '_>) -> Vec<RustC while let Some((event, offset)) = p.next() { if let Event::Start(Tag::CodeBlock(syntax)) = event { - let (syntax, code_start, code_end, range, is_fenced) = match syntax { + let (syntax, code_start, code_end, range, is_fenced, is_ignore) = match syntax { CodeBlockKind::Fenced(syntax) => { let syntax = syntax.as_ref(); let lang_string = if syntax.is_empty() { @@ -1219,6 +1220,7 @@ crate fn rust_code_blocks(md: &str, extra_info: &ExtraInfo<'_, '_>) -> Vec<RustC if !lang_string.rust { continue; } + let is_ignore = lang_string.ignore != Ignore::None; let syntax = if syntax.is_empty() { None } else { Some(syntax.to_owned()) }; let (code_start, mut code_end) = match p.next() { Some((Event::Text(_), offset)) => (offset.start, offset.end), @@ -1229,6 +1231,7 @@ crate fn rust_code_blocks(md: &str, extra_info: &ExtraInfo<'_, '_>) -> Vec<RustC range: offset, code, syntax, + is_ignore, }); continue; } @@ -1239,6 +1242,7 @@ crate fn rust_code_blocks(md: &str, extra_info: &ExtraInfo<'_, '_>) -> Vec<RustC range: offset, code, syntax, + is_ignore, }); continue; } @@ -1246,7 +1250,7 @@ crate fn rust_code_blocks(md: &str, extra_info: &ExtraInfo<'_, '_>) -> Vec<RustC while let Some((Event::Text(_), offset)) = p.next() { code_end = offset.end; } - (syntax, code_start, code_end, offset, true) + (syntax, code_start, code_end, offset, true, is_ignore) } CodeBlockKind::Indented => { // The ending of the offset goes too far sometime so we reduce it by one in @@ -1258,9 +1262,10 @@ crate fn rust_code_blocks(md: &str, extra_info: &ExtraInfo<'_, '_>) -> Vec<RustC offset.end, Range { start: offset.start, end: offset.end - 1 }, false, + false, ) } else { - (None, offset.start, offset.end, offset, false) + (None, offset.start, offset.end, offset, false, false) } } }; @@ -1270,6 +1275,7 @@ crate fn rust_code_blocks(md: &str, extra_info: &ExtraInfo<'_, '_>) -> Vec<RustC range, code: Range { start: code_start, end: code_end }, syntax, + is_ignore, }); } } |
