Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-05-09 04:23:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

SyntaxError handling when adding regex highlights

Browse Source 
If the user attempts to add any regular expressions that throw a syntax
error on RegExp object construction, they can see the first pattern that
throws an error along with its error message without breaking their
entire highlight list.
This commit is contained in:
Morfent 2015-02-18 07:51:46 -04:00
parent d2bc6dd260
commit d3ff9a4da8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/client-chat.js
View File

@ -570,8 +570,16 @@
switch (targets[0]) {
case 'add':
for (var i=1, len=targets.length; i<len; i++) {
highlights.push(targets[i].trim());
if (/[\\^$*+?()|{}[\]]/.test(targets[i])) {
// Catch any errors thrown by newly added regular expressions so they don't break the entire highlight list
try {
new RegExp(targets[i]);
} catch (e) {
return this.add(e.message.substr(0, 28) === 'Invalid regular expression: ' ? e.message : 'Invalid regular expression: /' + targets[i] + '/: ' + e.message);
}
}
}
highlights = highlights.concat(targets.slice(1));
this.add("Now highlighting on: " + highlights.join(', '));
// We update the regex
app.highlightRegExp = new RegExp('\\b('+highlights.join('|')+')\\b', 'i');