mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #113823 - GuillaumeGomez:fix-results-search-alias-display, r=notriddle

Browse Source 
Fix results search alias display

Currently it's displayed like this:

![Screenshot from 2023-07-18 14-23-35](https://github.com/rust-lang/rust/assets/3050060/119d8f18-b298-4e6f-9571-9f678fc19126)

With this fix:

![Screenshot from 2023-07-18 14-23-29](https://github.com/rust-lang/rust/assets/3050060/679d6241-420e-4f13-be78-dc061cbc488a)

r? `@notriddle`
This commit is contained in:
Matthias Krüger 2023-07-18 19:06:03 +02:00 committed by GitHub
commit 1b07da1d52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustdoc/html/static/css/rustdoc.css
View File

@ -888,7 +888,7 @@ so that we can apply CSS-filters to change the arrow color in themes */
justify-content: start; justify-content: start;
flex: 3; flex: 3;
} }
.search-results .result-name span.alias { .search-results .result-name .alias {
color: var(--search-results-alias-color); color: var(--search-results-alias-color);
} }
.search-results .result-name .grey { .search-results .result-name .grey {
@ -904,6 +904,9 @@ so that we can apply CSS-filters to change the arrow color in themes */
max-width: calc(100% - var(--search-typename-width)); max-width: calc(100% - var(--search-typename-width));
display: inline-block; display: inline-block;
} }
.search-results .result-name .path > * {
display: inline;
}
.popover { .popover {
position: absolute; position: absolute;

33
src/librustdoc/html/static/js/search.js
View File

@ -2108,30 +2108,23 @@ function initSearch(rawSearchIndex) {
const resultName = document.createElement("div"); const resultName = document.createElement("div");
resultName.className = "result-name"; resultName.className = "result-name";
if (item.is_alias) {
const alias = document.createElement("span");
alias.className = "alias";
const bold = document.createElement("b");
bold.innerText = item.alias;
alias.appendChild(bold);
alias.insertAdjacentHTML(
"beforeend",
"<i class=\"grey\">&nbsp;- see&nbsp;</i>");
resultName.appendChild(alias);
}
resultName.insertAdjacentHTML( resultName.insertAdjacentHTML(
"beforeend", "beforeend",
`\ `<span class="typename">${typeName}</span>`);
<span class="typename">${typeName}</span>\
<div class="path">\
${item.displayPath}<span class="${type}">${name}</span>\
</div>`);
link.appendChild(resultName); link.appendChild(resultName);
let alias = " ";
if (item.is_alias) {
alias = ` <div class="alias">\
<b>${item.alias}</b><i class="grey">&nbsp;- see&nbsp;</i>\
</div>`;
}
resultName.insertAdjacentHTML(
"beforeend",
`<div class="path">${alias}\
${item.displayPath}<span class="${type}">${name}</span>\
</div>`);
const description = document.createElement("div"); const description = document.createElement("div");
description.className = "desc"; description.className = "desc";
description.insertAdjacentHTML("beforeend", item.desc); description.insertAdjacentHTML("beforeend", item.desc);

2
tests/rustdoc-gui/search-reexport.goml
View File

@ -26,7 +26,7 @@ write: (".search-input", "AliasForTheStdReexport")
wait-for: "//a[@class='result-import']" wait-for: "//a[@class='result-import']"
assert-text: ( assert-text: (
"a.result-import .result-name", "a.result-import .result-name",
"AliasForTheStdReexport - see re-export test_docs::TheStdReexport", "re-export AliasForTheStdReexport - see test_docs::TheStdReexport",
) )
// Same thing again, we click on it to ensure the background is once again set as expected. // Same thing again, we click on it to ensure the background is once again set as expected.
click: "//a[@class='result-import']" click: "//a[@class='result-import']"

4
tests/rustdoc-gui/search-result-color.goml
View File

@ -368,8 +368,8 @@ define-function: (
// Waiting for the search results to appear... // Waiting for the search results to appear...
wait-for: "#search-tabs" wait-for: "#search-tabs"
// Checking that the colors for the alias element are the ones expected. // Checking that the colors for the alias element are the ones expected.
assert-css: (".result-name > .alias", {"color": |alias|}) assert-css: (".result-name .path .alias", {"color": |alias|})
assert-css: (".result-name > .alias > .grey", {"color": |grey|}) assert-css: (".result-name .path .alias > .grey", {"color": |grey|})
// Leave the search results to prevent reloading with an already filled search input. // Leave the search results to prevent reloading with an already filled search input.
press-key: "Escape" press-key: "Escape"
}, },