Make syntax highlighting work for all languages in clippy lints page

Author: GuillaumeGomez

tests/compile-test.rs

@@ -8,7 +8,7 @@ use clippy_config::ClippyConfiguration;
 use clippy_lints::LintInfo;
 use clippy_lints::declared_lints::LINTS;
 use clippy_lints::deprecated_lints::{DEPRECATED, DEPRECATED_VERSION, RENAMED};
-use pulldown_cmark::{Options, Parser, html};
+use pulldown_cmark::{CodeBlockKind, CowStr, Event, Options, Parser, Tag, html};
 use rinja::Template;
 use rinja::filters::Safe;
 use serde::Deserialize;
@@ -394,11 +394,27 @@ struct Renderer<'a> {
     lints: &'a Vec<LintMetadata>,
 }
 
+struct CodeBlockModifier<I>(I);
+
+impl<'a, I: Iterator<Item = Event<'a>>> Iterator for CodeBlockModifier<I> {
+    type Item = Event<'a>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let Some(event) = self.0.next() else { return None };
+        if let Event::Start(Tag::CodeBlock(CodeBlockKind::Fenced(ref lang))) = event {
+            if lang.split(',').any(|lang| ["", "rust", "ignore", "should_panic", "no_run", "compile_fail"].contains(&lang)) {
+                return Some(Event::Start(Tag::CodeBlock(CodeBlockKind::Fenced(CowStr::Borrowed("rust")))));
+            }
+        }
+        Some(event)
+    }
+}
+
 impl Renderer<'_> {
     fn markdown(input: &str) -> Safe<String> {
         let parser = Parser::new_ext(input, Options::all());
         let mut html_output = String::new();
-        html::push_html(&mut html_output, parser);
+        html::push_html(&mut html_output, CodeBlockModifier(parser));
         // Oh deer, what a hack :O
         Safe(html_output.replace("<table", "<table class=\"table\""))
     }

util/gh-pages/script.js

@@ -140,12 +140,8 @@ function onEachLazy(lazyArray, func) {
 
 function highlightIfNeeded(lintId) {
     const elem = document.getElementById(lintId);
-    const call = el => {
-        hljs.highlightElement(el.parentElement)
-        el.classList.add("highlighted");
-    };
-    onEachLazy(elem.querySelectorAll("pre > code.language-rust:not(.highlighted)"), call);
-    onEachLazy(elem.querySelectorAll("pre > code.language-no_run:not(.highlighted)"), call);
+    const call = el => hljs.highlightElement(el);
+    onEachLazy(elem.querySelectorAll("pre > code:not(.hljs)"), call);
 }
 
 function expandLint(lintId) {
@@ -197,9 +193,11 @@ function toggleExpansion(expand) {
     onEachLazy(
         document.querySelectorAll("article"),
         expand ? el => {
-            el.classList.remove("collapsed");
-            highlightIfNeeded(el);
-        } : el => el.classList.add("collapsed"),
+            el.querySelector("input[type='checkbox']").checked = true;
+            highlightIfNeeded(el.id);
+        } : el => {
+            el.querySelector("input[type='checkbox']").checked = false;
+        },
     );
 }