OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix path search in docs

Browse Source
This commit is contained in:
Guillaume Gomez 2017-11-18 17:30:19 +01:00
parent 18250b0349
commit ad6324f6f7
1 changed files with 120 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/librustdoc/html/static/main.js
View File

@ -374,11 +374,10 @@
results = {},
split = valLower.split("::");
// remove empty keywords
for (var j = 0; j < split.length; ++j) {
split[j].toLowerCase();
if (split[j] === "") {
split.splice(j, 1);
for (var z = 0; z < split.length; ++z) {
if (split[z] === "") {
split.slice(z, 1);
z -= 1;
}
}
@ -405,9 +404,7 @@
if (obj.generics &&
obj.generics.length >= val.generics.length) {
var elems = obj.generics.slice(0);
for (var y = 0;
y < val.generics.length;
++y) {
for (var y = 0; y < val.generics.length; ++y) {
// The point here is to find the type that matches the most.
var lev = { pos: -1, lev: MAX_LEV_DISTANCE + 1};
for (var x = 0; x < elems.length; ++x) {
@ -529,6 +526,22 @@
return literalSearch === true ? false : lev_distance;
}
function checkPath(startsWith, ty) {
var lev_total = 0;
var path = ty.path.split("::");
if (startsWith.length > path.length) {
return MAX_LEV_DISTANCE + 1;
}
for (var i = path.length - 1; i < startsWith.length; ++i) {
var lev = levenshtein(startsWith[i], path[i]);
if (lev > MAX_LEV_DISTANCE) {
return MAX_LEV_DISTANCE + 1;
}
lev_total += lev;
}
return Math.round(lev_total / startsWith.length);
}
function typePassesFilter(filter, type) {
// No filter
if (filter < 0) return true;
@ -665,24 +678,45 @@
query.search = val;
// gather matching search results up to a certain maximum
val = val.replace(/\_/g, "");
var valGenerics = extractGenerics(val);
var results_length = 0;
for (var i = 0; i < split.length; ++i) {
for (var j = 0; j < nSearchWords; ++j) {
var valGenerics = extractGenerics(val);
var paths = valLower.split("::");
var j;
for (j = 0; j < paths.length; ++j) {
if (paths[j] === "") {
paths.splice(j, 1);
j -= 1;
}
}
val = paths[paths.length - 1];
var startsWith = paths.slice(0, paths.length > 1 ? paths.length - 1 : 1);
for (j = 0; j < nSearchWords; ++j) {
var lev_distance;
var ty = searchIndex[j];
if (!ty) {
continue;
}
var lev_add = 0;
if (paths.length > 1) {
var lev = checkPath(startsWith, ty);
if (lev > MAX_LEV_DISTANCE) {
continue;
} else if (lev > 0) {
lev_add = 1;
}
}
var returned = false;
var in_args = false;
var index = -1;
// we want lev results to go lower than others
var lev = MAX_LEV_DISTANCE;
var lev = MAX_LEV_DISTANCE + 1;
var fullId = itemTypes[ty.ty] + ty.path + ty.name;
if (searchWords[j].indexOf(split[i]) > -1 ||
searchWords[j].indexOf(val) > -1 ||
if (searchWords[j].indexOf(val) > -1 ||
searchWords[j].replace(/_/g, "").indexOf(val) > -1)
{
// filter type: ... queries
@ -719,6 +753,7 @@
index = Math.max(0, index);
}
}
lev += lev_add;
if (index !== -1) {
if (results[fullId] === undefined) {
results[fullId] = {
@ -746,7 +781,6 @@
}
}
}
}
var ar = [];
for (var entry in results) {
@ -834,16 +868,14 @@
var result = results[i];
// this validation does not make sense when searching by types
if (result.dontValidate) {
if (result.dontValidate || result.returned === true && result.param === true) {
continue;
}
var name = result.item.name.toLowerCase(),
path = result.item.path.toLowerCase(),
parent = result.item.parent;
if (result.returned === false && result.param === false &&
validateResult(name, path, split, parent) === false)
{
if (validateResult(name, path, split, parent) === false) {
result.id = -1;
}
}