7 files changed, 156 insertions, 49 deletions

diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
index 0fd1d13e6..fe37d0245 100644
--- a/xtask/src/ast_src.rs
+++ b/xtask/src/ast_src.rs
@@ -184,7 +184,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "ITEM_LIST",
         "ASSOC_ITEM_LIST",
         "ATTR",
-        "META_ITEM", // not an item actually
+        "META",
         "USE_TREE",
         "USE_TREE_LIST",
         "PATH",
diff --git a/xtask/src/codegen/gen_lint_completions.rs b/xtask/src/codegen/gen_lint_completions.rs
index 24dbc6a39..54fcaa0e6 100644
--- a/xtask/src/codegen/gen_lint_completions.rs
+++ b/xtask/src/codegen/gen_lint_completions.rs
@@ -1,4 +1,5 @@
 //! Generates descriptors structure for unstable feature from Unstable Book
+use std::borrow::Cow;
 use std::fmt::Write;
 use std::path::{Path, PathBuf};
 
@@ -12,25 +13,75 @@ pub(crate) fn generate_lint_completions() -> Result<()> {
         cmd!("git clone --depth=1 https://github.com/rust-lang/rust ./target/rust").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())?;
+    let mut contents = String::from(
+        r#"pub struct Lint {
+    pub label: &'static str,
+    pub description: &'static str,
+}
+
+"#,
+    );
+    generate_lint_descriptor(&mut contents)?;
+    contents.push('\n');
+
+    generate_feature_descriptor(&mut contents, "./target/rust/src/doc/unstable-book/src".into())?;
     contents.push('\n');
 
-    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"))?;
+    cmd!("curl https://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");
+    let destination = project_root().join("crates/ide_db/src/helpers/generated_lints.rs");
     ensure_file_contents(destination.as_path(), &contents)?;
 
     Ok(())
 }
 
-fn generate_descriptor(buf: &mut String, src_dir: PathBuf) -> Result<()> {
-    buf.push_str(r#"pub(super) const FEATURES: &[LintCompletion] = &["#);
+fn generate_lint_descriptor(buf: &mut String) -> Result<()> {
+    let stdout = cmd!("rustc -W help").read()?;
+    let start_lints =
+        stdout.find("----  -------  -------").ok_or_else(|| anyhow::format_err!(""))?;
+    let start_lint_groups =
+        stdout.find("----  ---------").ok_or_else(|| anyhow::format_err!(""))?;
+    let end_lints =
+        stdout.find("Lint groups provided by rustc:").ok_or_else(|| anyhow::format_err!(""))?;
+    let end_lint_groups = stdout
+        .find("Lint tools like Clippy can provide additional lints and lint groups.")
+        .ok_or_else(|| anyhow::format_err!(""))?;
+    buf.push_str(r#"pub const DEFAULT_LINTS: &[Lint] = &["#);
+    buf.push('\n');
+    let mut lints = stdout[start_lints..end_lints]
+        .lines()
+        .skip(1)
+        .filter(|l| !l.is_empty())
+        .map(|line| {
+            let (name, rest) = line.trim().split_once(char::is_whitespace).unwrap();
+            let (_default_level, description) =
+                rest.trim().split_once(char::is_whitespace).unwrap();
+            (name.trim(), Cow::Borrowed(description.trim()))
+        })
+        .collect::<Vec<_>>();
+    lints.extend(
+        stdout[start_lint_groups..end_lint_groups].lines().skip(1).filter(|l| !l.is_empty()).map(
+            |line| {
+                let (name, lints) = line.trim().split_once(char::is_whitespace).unwrap();
+                (name.trim(), format!("lint group for: {}", lints.trim()).into())
+            },
+        ),
+    );
+
+    lints.sort_by(|(ident, _), (ident2, _)| ident.cmp(ident2));
+    lints.into_iter().for_each(|(name, description)| {
+        push_lint_completion(buf, &name.replace("-", "_"), &description)
+    });
+    buf.push_str("];\n");
+    Ok(())
+}
+
+fn generate_feature_descriptor(buf: &mut String, src_dir: PathBuf) -> Result<()> {
+    buf.push_str(r#"pub const FEATURES: &[Lint] = &["#);
     buf.push('\n');
-    ["language-features", "library-features"]
+    let mut vec = ["language-features", "library-features"]
         .iter()
         .flat_map(|it| WalkDir::new(src_dir.join(it)))
         .filter_map(|e| e.ok())
@@ -38,13 +89,16 @@ fn generate_descriptor(buf: &mut String, src_dir: PathBuf) -> Result<()> {
             // Get all `.md ` files
             entry.file_type().is_file() && entry.path().extension().unwrap_or_default() == "md"
         })
-        .for_each(|entry| {
+        .map(|entry| {
             let path = entry.path();
             let feature_ident = path.file_stem().unwrap().to_str().unwrap().replace("-", "_");
             let doc = read_file(path).unwrap();
-
-            push_lint_completion(buf, &feature_ident, &doc);
-        });
+            (feature_ident, doc)
+        })
+        .collect::<Vec<_>>();
+    vec.sort_by(|(feature_ident, _), (feature_ident2, _)| feature_ident.cmp(feature_ident2));
+    vec.into_iter()
+        .for_each(|(feature_ident, doc)| push_lint_completion(buf, &feature_ident, &doc));
     buf.push_str("];\n");
     Ok(())
 }
@@ -55,6 +109,10 @@ struct ClippyLint {
     id: String,
 }
 
+fn unescape(s: &str) -> String {
+    s.replace(r#"\""#, "").replace(r#"\n"#, "\n").replace(r#"\r"#, "")
+}
+
 fn generate_descriptor_clippy(buf: &mut String, path: &Path) -> Result<()> {
     let file_content = read_file(path)?;
     let mut clippy_lints: Vec<ClippyLint> = vec![];
@@ -81,12 +139,12 @@ fn generate_descriptor_clippy(buf: &mut String, path: &Path) -> Result<()> {
                 .strip_prefix(prefix_to_strip)
                 .expect("should be prefixed by what it does")
                 .strip_suffix(suffix_to_strip)
-                .expect("should be suffixed by comma")
-                .into();
+                .map(unescape)
+                .expect("should be suffixed by comma");
         }
     }
-
-    buf.push_str(r#"pub(super) const CLIPPY_LINTS: &[LintCompletion] = &["#);
+    clippy_lints.sort_by(|lint, lint2| lint.id.cmp(&lint2.id));
+    buf.push_str(r#"pub const CLIPPY_LINTS: &[Lint] = &["#);
     buf.push('\n');
     clippy_lints.into_iter().for_each(|clippy_lint| {
         let lint_ident = format!("clippy::{}", clippy_lint.id);
@@ -102,7 +160,7 @@ fn generate_descriptor_clippy(buf: &mut String, path: &Path) -> Result<()> {
 fn push_lint_completion(buf: &mut String, label: &str, description: &str) {
     writeln!(
         buf,
-        r###"    LintCompletion {{
+        r###"    Lint {{
         label: "{}",
         description: r##"{}"##
     }},"###,
diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs
index ba4b24848..5435da76e 100644
--- a/xtask/src/codegen/gen_syntax.rs
+++ b/xtask/src/codegen/gen_syntax.rs
@@ -94,18 +94,16 @@ fn generate_nodes(kinds: KindsSrc<'_>, grammar: &AstSrc) -> Result<String> {
                             support::children(&self.syntax)
                         }
                     }
-                } else {
-                    if let Some(token_kind) = field.token_kind() {
-                        quote! {
-                            pub fn #method_name(&self) -> Option<#ty> {
-                                support::token(&self.syntax, #token_kind)
-                            }
+                } else if let Some(token_kind) = field.token_kind() {
+                    quote! {
+                        pub fn #method_name(&self) -> Option<#ty> {
+                            support::token(&self.syntax, #token_kind)
                         }
-                    } else {
-                        quote! {
-                            pub fn #method_name(&self) -> Option<#ty> {
-                                support::child(&self.syntax)
-                            }
+                    }
+                } else {
+                    quote! {
+                        pub fn #method_name(&self) -> Option<#ty> {
+                            support::child(&self.syntax)
                         }
                     }
                 }
@@ -260,7 +258,7 @@ fn generate_nodes(kinds: KindsSrc<'_>, grammar: &AstSrc) -> Result<String> {
     for chunk in ast.split("# [pretty_doc_comment_placeholder_workaround] ") {
         res.push_str(chunk);
         if let Some(doc) = docs.next() {
-            write_doc_comment(&doc, &mut res);
+            write_doc_comment(doc, &mut res);
         }
     }
 
@@ -296,14 +294,14 @@ fn generate_syntax_kinds(grammar: KindsSrc<'_>) -> Result<String> {
 
     let full_keywords_values = &grammar.keywords;
     let full_keywords =
-        full_keywords_values.iter().map(|kw| format_ident!("{}_KW", to_upper_snake_case(&kw)));
+        full_keywords_values.iter().map(|kw| format_ident!("{}_KW", to_upper_snake_case(kw)));
 
     let all_keywords_values =
         grammar.keywords.iter().chain(grammar.contextual_keywords.iter()).collect::<Vec<_>>();
     let all_keywords_idents = all_keywords_values.iter().map(|kw| format_ident!("{}", kw));
     let all_keywords = all_keywords_values
         .iter()
-        .map(|name| format_ident!("{}_KW", to_upper_snake_case(&name)))
+        .map(|name| format_ident!("{}_KW", to_upper_snake_case(name)))
         .collect::<Vec<_>>();
 
     let literals =
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index d0bef7b7a..063e11a5a 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -1,4 +1,4 @@
-//! See https://github.com/matklad/cargo-xtask/.
+//! See <https://github.com/matklad/cargo-xtask/>.
 //!
 //! This binary defines various auxiliary build commands, which are not
 //! expressible with just `cargo`. Notably, it provides tests via `cargo test -p xtask`
diff --git a/xtask/src/metrics.rs b/xtask/src/metrics.rs
index b0b76b8aa..7b190d425 100644
--- a/xtask/src/metrics.rs
+++ b/xtask/src/metrics.rs
@@ -71,7 +71,7 @@ impl Metrics {
         Ok(())
     }
     fn measure_analysis_stats_self(&mut self) -> Result<()> {
-        self.measure_analysis_stats_path("self", &".")
+        self.measure_analysis_stats_path("self", ".")
     }
     fn measure_analysis_stats(&mut self, bench: &str) -> Result<()> {
         self.measure_analysis_stats_path(
@@ -81,9 +81,8 @@ impl Metrics {
     }
     fn measure_analysis_stats_path(&mut self, name: &str, path: &str) -> Result<()> {
         eprintln!("\nMeasuring analysis-stats/{}", name);
-        let output =
-            cmd!("./target/release/rust-analyzer --quiet analysis-stats --memory-usage {path}")
-                .read()?;
+        let output = cmd!("./target/release/rust-analyzer -q analysis-stats --memory-usage {path}")
+            .read()?;
         for (metric, value, unit) in parse_metrics(&output) {
             self.report(&format!("analysis-stats/{}/{}", name, metric), value, unit.into());
         }
diff --git a/xtask/src/release/changelog.rs b/xtask/src/release/changelog.rs
index ffcae2cf7..2384a746f 100644
--- a/xtask/src/release/changelog.rs
+++ b/xtask/src/release/changelog.rs
@@ -132,7 +132,7 @@ fn parse_changelog_line(s: &str) -> Option<PrInfo> {
             return Some(PrInfo { kind, message: Some(message) });
         }
     };
-    let res = PrInfo { kind, message };
+    let res = PrInfo { message, kind };
     Some(res)
 }
 
@@ -152,7 +152,7 @@ fn parse_title_line(s: &str) -> PrInfo {
                 PrKind::Skip => None,
                 _ => Some(s[prefix.len()..].to_string()),
             };
-            return PrInfo { kind, message };
+            return PrInfo { message, kind };
         }
     }
     PrInfo { kind: PrKind::Other, message: Some(s.to_string()) }
diff --git a/xtask/src/tidy.rs b/xtask/src/tidy.rs
index 6f687a788..f2ba8efef 100644
--- a/xtask/src/tidy.rs
+++ b/xtask/src/tidy.rs
@@ -1,4 +1,7 @@
-use std::path::{Path, PathBuf};
+use std::{
+    collections::HashSet,
+    path::{Path, PathBuf},
+};
 
 use xshell::{cmd, pushd, pushenv, read_file};
 
@@ -33,7 +36,7 @@ fn check_code_formatting() {
     let _e = pushenv("RUSTUP_TOOLCHAIN", "stable");
     crate::ensure_rustfmt().unwrap();
     let res = cmd!("cargo fmt -- --check").run();
-    if !res.is_ok() {
+    if res.is_err() {
         let _ = cmd!("cargo fmt").run();
     }
     res.unwrap()
@@ -81,6 +84,7 @@ Please adjust docs/dev/lsp-extensions.md.
 #[test]
 fn rust_files_are_tidy() {
     let mut tidy_docs = TidyDocs::default();
+    let mut tidy_marks = TidyMarks::default();
     for path in rust_files() {
         let text = read_file(&path).unwrap();
         check_todo(&path, &text);
@@ -88,8 +92,10 @@ fn rust_files_are_tidy() {
         check_trailing_ws(&path, &text);
         deny_clippy(&path, &text);
         tidy_docs.visit(&path, &text);
+        tidy_marks.visit(&path, &text);
     }
     tidy_docs.finish();
+    tidy_marks.finish();
 }
 
 #[test]
@@ -193,7 +199,9 @@ https://github.blog/2015-06-08-how-to-undo-almost-anything-with-git/#redo-after-
 fn deny_clippy(path: &Path, text: &str) {
     let ignore = &[
         // The documentation in string literals may contain anything for its own purposes
-        "ide_completion/src/generated_lint_completions.rs",
+        "ide_db/src/helpers/generated_lints.rs",
+        // The tests test clippy lint hovers
+        "ide/src/hover.rs",
     ];
     if ignore.iter().any(|p| path.ends_with(p)) {
         return;
@@ -244,19 +252,19 @@ Zlib OR Apache-2.0 OR MIT
         .map(|it| it.trim())
         .map(|it| it[r#""license":"#.len()..].trim_matches('"'))
         .collect::<Vec<_>>();
-    licenses.sort();
+    licenses.sort_unstable();
     licenses.dedup();
     if licenses != expected {
         let mut diff = String::new();
 
-        diff += &format!("New Licenses:\n");
+        diff.push_str("New Licenses:\n");
         for &l in licenses.iter() {
             if !expected.contains(&l) {
                 diff += &format!("  {}\n", l)
             }
         }
 
-        diff += &format!("\nMissing Licenses:\n");
+        diff.push_str("\nMissing Licenses:\n");
         for &l in expected.iter() {
             if !licenses.contains(&l) {
                 diff += &format!("  {}\n", l)
@@ -280,7 +288,7 @@ fn check_todo(path: &Path, text: &str) {
         // `ast::make`.
         "ast/make.rs",
         // The documentation in string literals may contain anything for its own purposes
-        "ide_completion/src/generated_lint_completions.rs",
+        "ide_db/src/helpers/generated_lints.rs",
     ];
     if need_todo.iter().any(|p| path.ends_with(p)) {
         return;
@@ -310,7 +318,7 @@ fn check_dbg(path: &Path, text: &str) {
         "ide_completion/src/completions/postfix.rs",
         // The documentation in string literals may contain anything for its own purposes
         "ide_completion/src/lib.rs",
-        "ide_completion/src/generated_lint_completions.rs",
+        "ide_db/src/helpers/generated_lints.rs",
         // test for doc test for remove_dbg
         "src/tests/generated.rs",
     ];
@@ -364,7 +372,10 @@ impl TidyDocs {
                 self.contains_fixme.push(path.to_path_buf());
             }
         } else {
-            if text.contains("// Feature:") || text.contains("// Assist:") {
+            if text.contains("// Feature:")
+                || text.contains("// Assist:")
+                || text.contains("// Diagnostic:")
+            {
                 return;
             }
             self.missing_docs.push(path.display().to_string());
@@ -406,6 +417,39 @@ fn is_exclude_dir(p: &Path, dirs_to_exclude: &[&str]) -> bool {
         .any(|it| dirs_to_exclude.contains(&it))
 }
 
+#[derive(Default)]
+struct TidyMarks {
+    hits: HashSet<String>,
+    checks: HashSet<String>,
+}
+
+impl TidyMarks {
+    fn visit(&mut self, _path: &Path, text: &str) {
+        for line in text.lines() {
+            if let Some(mark) = find_mark(line, "hit") {
+                self.hits.insert(mark.to_string());
+            }
+            if let Some(mark) = find_mark(line, "check") {
+                self.checks.insert(mark.to_string());
+            }
+            if let Some(mark) = find_mark(line, "check_count") {
+                self.checks.insert(mark.to_string());
+            }
+        }
+    }
+
+    fn finish(self) {
+        assert!(!self.hits.is_empty());
+
+        let diff: Vec<_> =
+            self.hits.symmetric_difference(&self.checks).map(|it| it.as_str()).collect();
+
+        if !diff.is_empty() {
+            panic!("unpaired marks: {:?}", diff)
+        }
+    }
+}
+
 #[allow(deprecated)]
 fn stable_hash(text: &str) -> u64 {
     use std::hash::{Hash, Hasher, SipHasher};
@@ -415,3 +459,11 @@ fn stable_hash(text: &str) -> u64 {
     text.hash(&mut hasher);
     hasher.finish()
 }
+
+fn find_mark<'a>(text: &'a str, mark: &'static str) -> Option<&'a str> {
+    let idx = text.find(mark)?;
+    let text = text[idx + mark.len()..].strip_prefix("!(")?;
+    let idx = text.find(|c: char| !(c.is_alphanumeric() || c == '_'))?;
+    let text = &text[..idx];
+    Some(text)
+}