diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-06-08 13:26:35 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-08 13:26:35 +0900 |
| commit | f99a892e6dabffc73fa26cde10ce7e54a252e660 (patch) | |
| tree | c98e226caa7e1ecae1299564c0717066a0aefe86 /src | |
| parent | e062121f036e632a2d4a698270dbf3accae919ee (diff) | |
| parent | 314ef592e284b16d4cb1764cec79cd5f0e0d0171 (diff) | |
| download | rust-f99a892e6dabffc73fa26cde10ce7e54a252e660.tar.gz rust-f99a892e6dabffc73fa26cde10ce7e54a252e660.zip | |
Rollup merge of #86095 - GuillaumeGomez:search-description-codeblock, r=jsha
Search description codeblock The codeblocks are not displayed correctly:  This PR interprets the HTML correctly (and still prevent invalid HTML because of how it inserts it):  r? ```@jsha```
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/static/search.js | 2 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/search-result-description.goml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/librustdoc/html/static/search.js b/src/librustdoc/html/static/search.js index b3242bf4df9..35be246b5bf 100644 --- a/src/librustdoc/html/static/search.js +++ b/src/librustdoc/html/static/search.js @@ -1024,7 +1024,7 @@ window.initSearch = function(rawSearchIndex) { var description = document.createElement("div"); description.className = "desc"; var spanDesc = document.createElement("span"); - spanDesc.innerText = item.desc + "\u00A0"; + spanDesc.insertAdjacentHTML("beforeend", item.desc); description.appendChild(spanDesc); wrapper.appendChild(description); diff --git a/src/test/rustdoc-gui/search-result-description.goml b/src/test/rustdoc-gui/search-result-description.goml new file mode 100644 index 00000000000..a50d03cf489 --- /dev/null +++ b/src/test/rustdoc-gui/search-result-description.goml @@ -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!") |
