bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #86095 - GuillaumeGomez:search-description-codeblock, r=jsha

Browse source 
Search description codeblock

The codeblocks are not displayed correctly:

![Screenshot from 2021-06-07 11-11-53](https://user-images.githubusercontent.com/3050060/120991915-5fb05680-c782-11eb-9b32-973a64b1f631.png)

This PR interprets the HTML correctly (and still prevent invalid HTML because of how it inserts it):

![Screenshot from 2021-06-07 11-12-00](https://user-images.githubusercontent.com/3050060/120991919-6048ed00-c782-11eb-8ac5-c3aa6508bc8b.png)

r? ```@jsha```
This commit is contained in:
Yuki Okushi 2021-06-08 13:26:35 +09:00 • committed by GitHub
commit f99a892e6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustdoc/html/static/search.js
View file

@ -1024,7 +1024,7 @@ window.initSearch = function(rawSearchIndex) {
var description = document.createElement("div"); var description = document.createElement("div");
description.className = "desc"; description.className = "desc";
var spanDesc = document.createElement("span"); var spanDesc = document.createElement("span");
spanDesc.innerText = item.desc + "\u00A0"; spanDesc.insertAdjacentHTML("beforeend", item.desc);
description.appendChild(spanDesc); description.appendChild(spanDesc);
wrapper.appendChild(description); wrapper.appendChild(description);

5
src/test/rustdoc-gui/search-result-description.goml Normal file
View file

@ -0,0 +1,5 @@
// This test is to ensure that the codeblocks are correctly rendered in the search results.
goto: file://|DOC_PATH|/test_docs/index.html?search=some_more_function
// Waiting for the search results to appear...
wait-for: "#titles"
assert: (".search-results .desc code", "format!")