diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2017-10-29 13:39:11 +0100 |
|---|---|---|
| committer | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2017-11-01 13:41:43 +0100 |
| commit | f6a546e14d1e318eb6e38343eb98d20ac788437a (patch) | |
| tree | fc473d1a1fe6baf70183af616a89fb1528427d8d | |
| parent | 6f21008aba0242cf622a98cca52fb4a3a6dfca5b (diff) | |
| download | rust-f6a546e14d1e318eb6e38343eb98d20ac788437a.tar.gz | |
Be more flexible when looking for something by using levenshtein method
| -rw-r--r-- | src/librustdoc/html/static/main.js | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js index 55ebfcc3707..5bef81c9662 100644 --- a/src/librustdoc/html/static/main.js +++ b/src/librustdoc/html/static/main.js @@ -361,19 +361,30 @@ } function findArg(obj, val) { + var lev_distance = MAX_LEV_DISTANCE + 1; if (obj && obj.type && obj.type.inputs.length > 0) { for (var i = 0; i < obj.type.inputs.length; i++) { if (obj.type.inputs[i].name === val) { - return true; + // No need to check anything else: we found it. Let's just move on. + return 0; + } + var tmp = levenshtein(obj.type.inputs[i].name, val); + if (tmp < lev_distance) { + lev_distance = tmp; } } } - return false; + return lev_distance; } function checkReturned(obj, val) { - return obj && obj.type && obj.type.output && - obj.type.output.name.toLowerCase() === val; + if (obj && obj.type && obj.type.output) { + if (obj.type.output.name.toLowerCase() === val) { + return 0; + } + return levenshtein(obj.type.output.name.toLowerCase(), val); + } + return MAX_LEV_DISTANCE + 1; } function typePassesFilter(filter, type) { @@ -489,8 +500,7 @@ }); } } else if ( - (lev_distance = levenshtein(searchWords[j], val)) <= - MAX_LEV_DISTANCE) { + (lev_distance = levenshtein(searchWords[j], val)) <= MAX_LEV_DISTANCE) { if (typePassesFilter(typeFilter, searchIndex[j].ty)) { results.push({ id: j, @@ -499,7 +509,8 @@ lev: lev_distance, }); } - } else if (findArg(searchIndex[j], val)) { + } else if ( + (lev_distance = findArg(searchIndex[j], val)) <= MAX_LEV_DISTANCE) { if (typePassesFilter(typeFilter, searchIndex[j].ty)) { results.push({ id: j, @@ -508,7 +519,9 @@ lev: lev_distance, }); } - } else if (checkReturned(searchIndex[j], val)) { + } else if ( + (lev_distance = checkReturned(searchIndex[j], val)) <= + MAX_LEV_DISTANCE) { if (typePassesFilter(typeFilter, searchIndex[j].ty)) { results.push({ id: j, |