Skip to content

rustdoc: move some search code into search.js #84150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 17, 2021
Merged

rustdoc: move some search code into search.js #84150

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
276ee6f
Move search JS into search-index.js
jsha Apr 12, 2021
95d652e
Consolidate search-related vars and functions.
jsha Apr 13, 2021
11f854d
Further consolidate search-related vars and funcs
jsha Apr 13, 2021
5278949
Split search.js from search-index.js.
jsha Apr 13, 2021
d44c6ed
Updated tester.js for separate search.js
jsha Apr 13, 2021
a245642
Change root_path to static_root_path
jsha Apr 14, 2021
6f1f3eb
Update comment on search.js static file.
jsha Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated tester.js for separate search.js
  • Loading branch information
@jsha
jsha committed Apr 13, 2021
commit d44c6ed35111bdabe67f0a54fd99c4671b6c55f8
12 changes: 6 additions & 6 deletions src/tools/rustdoc-js/tester.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ function lookForEntry(entry, data) {
return null;
}

function loadMainJsAndIndex(mainJs, searchIndex, storageJs, crate) {
function loadSearchJsAndIndex(searchJs, searchIndex, storageJs, crate) {
if (searchIndex[searchIndex.length - 1].length === 0) {
searchIndex.pop();
}
Expand All @@ -270,9 +270,9 @@ function loadMainJsAndIndex(mainJs, searchIndex, storageJs, crate) {
ALIASES = {};
finalJS += 'window = { "currentCrate": "' + crate + '", rootPath: "../" };\n';
finalJS += loadThings(["hasOwnProperty", "onEach"], 'function', extractFunction, storageJs);
finalJS += loadThings(arraysToLoad, 'array', extractArrayVariable, mainJs);
finalJS += loadThings(variablesToLoad, 'variable', extractVariable, mainJs);
finalJS += loadThings(functionsToLoad, 'function', extractFunction, mainJs);
finalJS += loadThings(arraysToLoad, 'array', extractArrayVariable, searchJs);
finalJS += loadThings(variablesToLoad, 'variable', extractVariable, searchJs);
finalJS += loadThings(functionsToLoad, 'function', extractFunction, searchJs);

var loaded = loadContent(finalJS);
var index = loaded.buildIndex(searchIndex.rawSearchIndex);
Expand Down Expand Up @@ -382,12 +382,12 @@ function runChecks(testFile, loaded, index) {
}

function load_files(doc_folder, resource_suffix, crate) {
var mainJs = readFile(path.join(doc_folder, "main" + resource_suffix + ".js"));
var searchJs = readFile(path.join(doc_folder, "search" + resource_suffix + ".js"));
var storageJs = readFile(path.join(doc_folder, "storage" + resource_suffix + ".js"));
var searchIndex = readFile(
path.join(doc_folder, "search-index" + resource_suffix + ".js")).split("\n");

return loadMainJsAndIndex(mainJs, searchIndex, storageJs, crate);
return loadSearchJsAndIndex(searchJs, searchIndex, storageJs, crate);
}

function showHelp() {
Expand Down