user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add isIdentCharacter function to ensure that unexpected characters are handled correctly

Browse source
This commit is contained in:
Guillaume Gomez 2022-03-23 17:26:32 +01:00
parent f9251eef68
commit 8e29ed43d9
3 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/librustdoc/html/static/js/search.js
View file

@ -211,6 +211,21 @@ window.initSearch = function(rawSearchIndex) {
return parserState.userQuery.slice(parserState.pos, parserState.pos + 2) == '->';
}
/**
* Returns `true` if the given `c` character is valid for an ident.
*
* @param {string} c
*
* @return {boolean}
*/
function isIdentCharacter(c) {
return (
c === '_' ||
(c >= '0' && c <= '9') ||
(c >= 'a' && c <= 'z') ||
(c >= 'A' && c <= 'Z'));
}
/**
* @param {ParsedQuery} query
* @param {ParserState} parserState
@ -274,18 +289,22 @@ window.initSearch = function(rawSearchIndex) {
} else {
while (parserState.pos < parserState.length) {
var c = parserState.userQuery[parserState.pos];
if (isErrorCharacter(c)) {
throw new Error(`Unexpected \`${c}\``);
} else if (isStopCharacter(c) || isSpecialStartCharacter(c)) {
break;
}
// If we allow paths ("str::string" for example).
else if (c === ":") {
if (!isPathStart(parserState)) {
if (!isIdentCharacter(c)) {
if (isErrorCharacter(c)) {
throw new Error(`Unexpected \`${c}\``);
} else if (isStopCharacter(c) || isSpecialStartCharacter(c)) {
break;
}
// Skip current ":".
parserState.pos += 1;
// If we allow paths ("str::string" for example).
else if (c === ":") {
if (!isPathStart(parserState)) {
break;
}
// Skip current ":".
parserState.pos += 1;
} else {
throw new Error(`Unexpected \`${c}\``);
}
}
parserState.pos += 1;
end = parserState.pos;