diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-20 10:46:43 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-10-20 10:46:43 +0100 |
commit | 4c00bdea675d33d578cff1c0d7cc3967303e6653 (patch) | |
tree | bc1cd5b714e9566e2c87f33582d8c587cf46f6c0 /xtask/src/codegen | |
parent | 378dd90bab65fa6df078444c3932118105a460b8 (diff) | |
parent | b8a74e03708819c04862005ad0a91757dd63d654 (diff) |
Merge #6266
6266: Generate diagnostics docs r=matklad a=popzxc
Resolves #6215
Co-authored-by: Igor Aleksanov <[email protected]>
Diffstat (limited to 'xtask/src/codegen')
-rw-r--r-- | xtask/src/codegen/gen_assists_docs.rs | 4 | ||||
-rw-r--r-- | xtask/src/codegen/gen_diagnostic_docs.rs | 74 | ||||
-rw-r--r-- | xtask/src/codegen/gen_feature_docs.rs | 4 | ||||
-rw-r--r-- | xtask/src/codegen/gen_parser_tests.rs | 2 |
4 files changed, 79 insertions, 5 deletions
diff --git a/xtask/src/codegen/gen_assists_docs.rs b/xtask/src/codegen/gen_assists_docs.rs index ff307e2aa..d7c85ebe9 100644 --- a/xtask/src/codegen/gen_assists_docs.rs +++ b/xtask/src/codegen/gen_assists_docs.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | //! Generates `assists.md` documentation. | 1 | //! Generates `assists.md` documentation. |
2 | 2 | ||
3 | use std::{fmt, fs, path::Path}; | 3 | use std::{fmt, path::Path}; |
4 | 4 | ||
5 | use crate::{ | 5 | use crate::{ |
6 | codegen::{self, extract_comment_blocks_with_empty_lines, reformat, Location, Mode, PREAMBLE}, | 6 | codegen::{self, extract_comment_blocks_with_empty_lines, reformat, Location, Mode, PREAMBLE}, |
@@ -39,7 +39,7 @@ impl Assist { | |||
39 | return Ok(res); | 39 | return Ok(res); |
40 | 40 | ||
41 | fn collect_file(acc: &mut Vec<Assist>, path: &Path) -> Result<()> { | 41 | fn collect_file(acc: &mut Vec<Assist>, path: &Path) -> Result<()> { |
42 | let text = fs::read_to_string(path)?; | 42 | let text = xshell::read_file(path)?; |
43 | let comment_blocks = extract_comment_blocks_with_empty_lines("Assist", &text); | 43 | let comment_blocks = extract_comment_blocks_with_empty_lines("Assist", &text); |
44 | 44 | ||
45 | for block in comment_blocks { | 45 | for block in comment_blocks { |
diff --git a/xtask/src/codegen/gen_diagnostic_docs.rs b/xtask/src/codegen/gen_diagnostic_docs.rs new file mode 100644 index 000000000..00aaea5b7 --- /dev/null +++ b/xtask/src/codegen/gen_diagnostic_docs.rs | |||
@@ -0,0 +1,74 @@ | |||
1 | //! Generates `assists.md` documentation. | ||
2 | |||
3 | use std::{fmt, path::PathBuf}; | ||
4 | |||
5 | use crate::{ | ||
6 | codegen::{self, extract_comment_blocks_with_empty_lines, Location, Mode, PREAMBLE}, | ||
7 | project_root, rust_files, Result, | ||
8 | }; | ||
9 | |||
10 | pub fn generate_diagnostic_docs(mode: Mode) -> Result<()> { | ||
11 | let diagnostics = Diagnostic::collect()?; | ||
12 | let contents = | ||
13 | diagnostics.into_iter().map(|it| it.to_string()).collect::<Vec<_>>().join("\n\n"); | ||
14 | let contents = format!("//{}\n{}\n", PREAMBLE, contents.trim()); | ||
15 | let dst = project_root().join("docs/user/generated_diagnostic.adoc"); | ||
16 | codegen::update(&dst, &contents, mode)?; | ||
17 | Ok(()) | ||
18 | } | ||
19 | |||
20 | #[derive(Debug)] | ||
21 | struct Diagnostic { | ||
22 | id: String, | ||
23 | location: Location, | ||
24 | doc: String, | ||
25 | } | ||
26 | |||
27 | impl Diagnostic { | ||
28 | fn collect() -> Result<Vec<Diagnostic>> { | ||
29 | let mut res = Vec::new(); | ||
30 | for path in rust_files(&project_root()) { | ||
31 | collect_file(&mut res, path)?; | ||
32 | } | ||
33 | res.sort_by(|lhs, rhs| lhs.id.cmp(&rhs.id)); | ||
34 | return Ok(res); | ||
35 | |||
36 | fn collect_file(acc: &mut Vec<Diagnostic>, path: PathBuf) -> Result<()> { | ||
37 | let text = xshell::read_file(&path)?; | ||
38 | let comment_blocks = extract_comment_blocks_with_empty_lines("Diagnostic", &text); | ||
39 | |||
40 | for block in comment_blocks { | ||
41 | let id = block.id; | ||
42 | if let Err(msg) = is_valid_diagnostic_name(&id) { | ||
43 | panic!("invalid diagnostic name: {:?}:\n {}", id, msg) | ||
44 | } | ||
45 | let doc = block.contents.join("\n"); | ||
46 | let location = Location::new(path.clone(), block.line); | ||
47 | acc.push(Diagnostic { id, location, doc }) | ||
48 | } | ||
49 | |||
50 | Ok(()) | ||
51 | } | ||
52 | } | ||
53 | } | ||
54 | |||
55 | fn is_valid_diagnostic_name(diagnostic: &str) -> Result<(), String> { | ||
56 | let diagnostic = diagnostic.trim(); | ||
57 | if diagnostic.find(char::is_whitespace).is_some() { | ||
58 | return Err("Diagnostic names can't contain whitespace symbols".into()); | ||
59 | } | ||
60 | if diagnostic.chars().any(|c| c.is_ascii_uppercase()) { | ||
61 | return Err("Diagnostic names can't contain uppercase symbols".into()); | ||
62 | } | ||
63 | if diagnostic.chars().any(|c| !c.is_ascii()) { | ||
64 | return Err("Diagnostic can't contain non-ASCII symbols".into()); | ||
65 | } | ||
66 | |||
67 | Ok(()) | ||
68 | } | ||
69 | |||
70 | impl fmt::Display for Diagnostic { | ||
71 | fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
72 | writeln!(f, "=== {}\n**Source:** {}\n{}", self.id, self.location, self.doc) | ||
73 | } | ||
74 | } | ||
diff --git a/xtask/src/codegen/gen_feature_docs.rs b/xtask/src/codegen/gen_feature_docs.rs index 341e67c73..065dd33f1 100644 --- a/xtask/src/codegen/gen_feature_docs.rs +++ b/xtask/src/codegen/gen_feature_docs.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | //! Generates `assists.md` documentation. | 1 | //! Generates `assists.md` documentation. |
2 | 2 | ||
3 | use std::{fmt, fs, path::PathBuf}; | 3 | use std::{fmt, path::PathBuf}; |
4 | 4 | ||
5 | use crate::{ | 5 | use crate::{ |
6 | codegen::{self, extract_comment_blocks_with_empty_lines, Location, Mode, PREAMBLE}, | 6 | codegen::{self, extract_comment_blocks_with_empty_lines, Location, Mode, PREAMBLE}, |
@@ -33,7 +33,7 @@ impl Feature { | |||
33 | return Ok(res); | 33 | return Ok(res); |
34 | 34 | ||
35 | fn collect_file(acc: &mut Vec<Feature>, path: PathBuf) -> Result<()> { | 35 | fn collect_file(acc: &mut Vec<Feature>, path: PathBuf) -> Result<()> { |
36 | let text = fs::read_to_string(&path)?; | 36 | let text = xshell::read_file(&path)?; |
37 | let comment_blocks = extract_comment_blocks_with_empty_lines("Feature", &text); | 37 | let comment_blocks = extract_comment_blocks_with_empty_lines("Feature", &text); |
38 | 38 | ||
39 | for block in comment_blocks { | 39 | for block in comment_blocks { |
diff --git a/xtask/src/codegen/gen_parser_tests.rs b/xtask/src/codegen/gen_parser_tests.rs index 96fdd9216..19ae949d4 100644 --- a/xtask/src/codegen/gen_parser_tests.rs +++ b/xtask/src/codegen/gen_parser_tests.rs | |||
@@ -124,7 +124,7 @@ fn existing_tests(dir: &Path, ok: bool) -> Result<HashMap<String, (PathBuf, Test | |||
124 | let file_name = path.file_name().unwrap().to_str().unwrap(); | 124 | let file_name = path.file_name().unwrap().to_str().unwrap(); |
125 | file_name[5..file_name.len() - 3].to_string() | 125 | file_name[5..file_name.len() - 3].to_string() |
126 | }; | 126 | }; |
127 | let text = fs::read_to_string(&path)?; | 127 | let text = xshell::read_file(&path)?; |
128 | let test = Test { name: name.clone(), text, ok }; | 128 | let test = Test { name: name.clone(), text, ok }; |
129 | if let Some(old) = res.insert(name, (path, test)) { | 129 | if let Some(old) = res.insert(name, (path, test)) { |
130 | println!("Duplicate test: {:?}", old); | 130 | println!("Duplicate test: {:?}", old); |