7 files changed, 41 insertions, 87 deletions

diff --git a/xtask/src/codegen/gen_assists_docs.rs b/xtask/src/codegen/gen_assists_docs.rs
index 1ae1343a5..c469b388d 100644
--- a/xtask/src/codegen/gen_assists_docs.rs
+++ b/xtask/src/codegen/gen_assists_docs.rs
@@ -7,12 +7,12 @@ use crate::{
     project_root, rust_files_in, Result,
 };
 
-pub fn generate_assists_tests(mode: Mode) -> Result<()> {
+pub(crate) fn generate_assists_tests(mode: Mode) -> Result<()> {
     let assists = Assist::collect()?;
     generate_tests(&assists, mode)
 }
 
-pub fn generate_assists_docs(mode: Mode) -> Result<()> {
+pub(crate) fn generate_assists_docs(mode: Mode) -> Result<()> {
     let assists = Assist::collect()?;
     let contents = assists.into_iter().map(|it| it.to_string()).collect::<Vec<_>>().join("\n\n");
     let contents = format!("//{}\n{}\n", PREAMBLE, contents.trim());
diff --git a/xtask/src/codegen/gen_diagnostic_docs.rs b/xtask/src/codegen/gen_diagnostic_docs.rs
index 7c14d4a07..a2561817b 100644
--- a/xtask/src/codegen/gen_diagnostic_docs.rs
+++ b/xtask/src/codegen/gen_diagnostic_docs.rs
@@ -7,7 +7,7 @@ use crate::{
     project_root, rust_files, Result,
 };
 
-pub fn generate_diagnostic_docs(mode: Mode) -> Result<()> {
+pub(crate) fn generate_diagnostic_docs(mode: Mode) -> Result<()> {
     let diagnostics = Diagnostic::collect()?;
     let contents =
         diagnostics.into_iter().map(|it| it.to_string()).collect::<Vec<_>>().join("\n\n");
diff --git a/xtask/src/codegen/gen_feature_docs.rs b/xtask/src/codegen/gen_feature_docs.rs
index 61081063b..cad7ff477 100644
--- a/xtask/src/codegen/gen_feature_docs.rs
+++ b/xtask/src/codegen/gen_feature_docs.rs
@@ -7,7 +7,7 @@ use crate::{
     project_root, rust_files, Result,
 };
 
-pub fn generate_feature_docs(mode: Mode) -> Result<()> {
+pub(crate) fn generate_feature_docs(mode: Mode) -> Result<()> {
     let features = Feature::collect()?;
     let contents = features.into_iter().map(|it| it.to_string()).collect::<Vec<_>>().join("\n\n");
     let contents = format!("//{}\n{}\n", PREAMBLE, contents.trim());
diff --git a/xtask/src/codegen/gen_features.rs b/xtask/src/codegen/gen_features.rs
deleted file mode 100644
index 3cf15ce02..000000000
--- a/xtask/src/codegen/gen_features.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-//! Generates descriptors structure for unstable feature from Unstable Book
-use std::path::{Path, PathBuf};
-
-use quote::quote;
-use walkdir::WalkDir;
-use xshell::{cmd, read_file};
-
-use crate::codegen::{project_root, reformat, update, Mode, Result};
-
-pub fn generate_features(mode: Mode) -> Result<()> {
-    if !Path::new("./target/rust").exists() {
-        cmd!("git clone https://github.com/rust-lang/rust ./target/rust").run()?;
-    }
-
-    let contents = generate_descriptor("./target/rust/src/doc/unstable-book/src".into())?;
-
-    let destination = project_root().join("crates/ide/src/completion/generated_features.rs");
-    update(destination.as_path(), &contents, mode)?;
-
-    Ok(())
-}
-
-fn generate_descriptor(src_dir: PathBuf) -> Result<String> {
-    let definitions = ["language-features", "library-features"]
-        .iter()
-        .flat_map(|it| WalkDir::new(src_dir.join(it)))
-        .filter_map(|e| e.ok())
-        .filter(|entry| {
-            // Get all `.md ` files
-            entry.file_type().is_file() && entry.path().extension().unwrap_or_default() == "md"
-        })
-        .map(|entry| {
-            let path = entry.path();
-            let feature_ident = path.file_stem().unwrap().to_str().unwrap().replace("-", "_");
-            let doc = read_file(path).unwrap();
-
-            quote! { LintCompletion { label: #feature_ident, description: #doc } }
-        });
-
-    let ts = quote! {
-        use crate::completion::complete_attribute::LintCompletion;
-
-        pub(super) const FEATURES:  &[LintCompletion] = &[
-            #(#definitions),*
-        ];
-    };
-    reformat(&ts.to_string())
-}
diff --git a/xtask/src/codegen/gen_lint_completions.rs b/xtask/src/codegen/gen_lint_completions.rs
index 25f770eaf..b1c057037 100644
--- a/xtask/src/codegen/gen_lint_completions.rs
+++ b/xtask/src/codegen/gen_lint_completions.rs
@@ -1,7 +1,7 @@
 //! Generates descriptors structure for unstable feature from Unstable Book
+use std::fmt::Write;
 use std::path::{Path, PathBuf};
 
-use quote::quote;
 use walkdir::WalkDir;
 use xshell::{cmd, read_file};
 
@@ -10,21 +10,18 @@ use crate::{
     run_rustfmt,
 };
 
-pub fn generate_lint_completions(mode: Mode) -> Result<()> {
+pub(crate) fn generate_lint_completions(mode: Mode) -> Result<()> {
     if !Path::new("./target/rust").exists() {
         cmd!("git clone --depth=1 https://github.com/rust-lang/rust ./target/rust").run()?;
     }
 
-    let ts_features = generate_descriptor("./target/rust/src/doc/unstable-book/src".into())?;
-    cmd!("curl http://rust-lang.github.io/rust-clippy/master/lints.json --output ./target/clippy_lints.json").run()?;
+    let mut contents = String::from("use crate::completions::attribute::LintCompletion;\n\n");
+    generate_descriptor(&mut contents, "./target/rust/src/doc/unstable-book/src".into())?;
+    contents.push('\n');
 
-    let ts_clippy = generate_descriptor_clippy(&Path::new("./target/clippy_lints.json"))?;
-    let ts = quote! {
-        use crate::completions::attribute::LintCompletion;
-        #ts_features
-        #ts_clippy
-    };
-    let contents = reformat(ts.to_string().as_str())?;
+    cmd!("curl http://rust-lang.github.io/rust-clippy/master/lints.json --output ./target/clippy_lints.json").run()?;
+    generate_descriptor_clippy(&mut contents, &Path::new("./target/clippy_lints.json"))?;
+    let contents = reformat(&contents)?;
 
     let destination =
         project_root().join("crates/ide_completion/src/generated_lint_completions.rs");
@@ -34,8 +31,10 @@ pub fn generate_lint_completions(mode: Mode) -> Result<()> {
     Ok(())
 }
 
-fn generate_descriptor(src_dir: PathBuf) -> Result<proc_macro2::TokenStream> {
-    let definitions = ["language-features", "library-features"]
+fn generate_descriptor(buf: &mut String, src_dir: PathBuf) -> Result<()> {
+    buf.push_str(r#"pub(super) const FEATURES: &[LintCompletion] = &["#);
+    buf.push('\n');
+    ["language-features", "library-features"]
         .iter()
         .flat_map(|it| WalkDir::new(src_dir.join(it)))
         .filter_map(|e| e.ok())
@@ -43,21 +42,15 @@ fn generate_descriptor(src_dir: PathBuf) -> Result<proc_macro2::TokenStream> {
             // Get all `.md ` files
             entry.file_type().is_file() && entry.path().extension().unwrap_or_default() == "md"
         })
-        .map(|entry| {
+        .for_each(|entry| {
             let path = entry.path();
             let feature_ident = path.file_stem().unwrap().to_str().unwrap().replace("-", "_");
             let doc = read_file(path).unwrap();
 
-            quote! { LintCompletion { label: #feature_ident, description: #doc } }
+            push_lint_completion(buf, &feature_ident, &doc);
         });
-
-    let ts = quote! {
-        pub(super) const FEATURES:  &[LintCompletion] = &[
-            #(#definitions),*
-        ];
-    };
-
-    Ok(ts)
+    buf.push_str("];\n");
+    Ok(())
 }
 
 #[derive(Default)]
@@ -66,7 +59,7 @@ struct ClippyLint {
     id: String,
 }
 
-fn generate_descriptor_clippy(path: &Path) -> Result<proc_macro2::TokenStream> {
+fn generate_descriptor_clippy(buf: &mut String, path: &Path) -> Result<()> {
     let file_content = read_file(path)?;
     let mut clippy_lints: Vec<ClippyLint> = vec![];
 
@@ -97,18 +90,27 @@ fn generate_descriptor_clippy(path: &Path) -> Result<proc_macro2::TokenStream> {
         }
     }
 
-    let definitions = clippy_lints.into_iter().map(|clippy_lint| {
+    buf.push_str(r#"pub(super) const CLIPPY_LINTS: &[LintCompletion] = &["#);
+    buf.push('\n');
+    clippy_lints.into_iter().for_each(|clippy_lint| {
         let lint_ident = format!("clippy::{}", clippy_lint.id);
         let doc = clippy_lint.help;
-
-        quote! { LintCompletion { label: #lint_ident, description: #doc } }
+        push_lint_completion(buf, &lint_ident, &doc);
     });
 
-    let ts = quote! {
-        pub(super) const CLIPPY_LINTS:  &[LintCompletion] = &[
-            #(#definitions),*
-        ];
-    };
+    buf.push_str("];\n");
+
+    Ok(())
+}
 
-    Ok(ts)
+fn push_lint_completion(buf: &mut String, label: &str, description: &str) {
+    writeln!(
+        buf,
+        r###"    LintCompletion {{
+        label: "{}",
+        description: r##"{}"##
+    }},"###,
+        label, description
+    )
+    .unwrap();
 }
diff --git a/xtask/src/codegen/gen_parser_tests.rs b/xtask/src/codegen/gen_parser_tests.rs
index 6e4abd10c..cb8939063 100644
--- a/xtask/src/codegen/gen_parser_tests.rs
+++ b/xtask/src/codegen/gen_parser_tests.rs
@@ -12,7 +12,7 @@ use crate::{
     project_root, Result,
 };
 
-pub fn generate_parser_tests(mode: Mode) -> Result<()> {
+pub(crate) fn generate_parser_tests(mode: Mode) -> Result<()> {
     let tests = tests_from_dir(&project_root().join(Path::new("crates/parser/src/grammar")))?;
     fn install_tests(tests: &HashMap<String, Test>, into: &str, mode: Mode) -> Result<()> {
         let tests_dir = project_root().join(into);
diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs
index eb524d85a..191bc0e9d 100644
--- a/xtask/src/codegen/gen_syntax.rs
+++ b/xtask/src/codegen/gen_syntax.rs
@@ -18,7 +18,7 @@ use crate::{
     project_root, Result,
 };
 
-pub fn generate_syntax(mode: Mode) -> Result<()> {
+pub(crate) fn generate_syntax(mode: Mode) -> Result<()> {
     let grammar = rust_grammar();
     let ast = lower(&grammar);