Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: lib/snippets.js

Issue 29761597: Issue 6538, 6781 - Implement script parsing for snippets (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Rebase Created May 23, 2018, 4:12 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | test/snippets.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/snippets.js
===================================================================
--- a/lib/snippets.js
+++ b/lib/snippets.js
@@ -70,8 +70,86 @@
if (filter.isActiveOnDomain(domain))
result.push(filter.script);
}
return result;
}
};
exports.Snippets = Snippets;
+
+/**
+ * Parses a script and returns a list of all its commands and their arguments
+ * @param {string} script
+ * @return {Array.<string[]>}
+ */
+function parseScript(script)
kzar 2018/07/10 13:55:20 I found this terminology confusing, "script" is th
Manish Jethani 2018/07/11 19:04:41 The argument to this function is the SnippetFilter
kzar 2018/07/12 10:30:36 Fair enough.
+{
+ const singleCharacterEscapes = new Map([
kzar 2018/07/10 13:55:20 Might be better to declare this once at the top of
Manish Jethani 2018/07/11 19:04:41 Done.
+ ["n", "\n"], ["r", "\r"], ["t", "\t"]
+ ]);
+
+ let tree = [];
+
+ let escape = false;
+ let literal = false;
+
+ let unicodeEscape = null;
+
+ let call = [];
+ let argument = "";
+
+ for (let character of [...script.trim(), ";"])
kzar 2018/07/10 13:55:20 Why not just do `script = script.trim() + ";";` ab
Manish Jethani 2018/07/11 19:04:41 Done.
+ {
+ if (unicodeEscape != null)
+ {
+ unicodeEscape += character;
+
+ if (unicodeEscape.length == 4)
kzar 2018/07/10 13:55:20 What if unicodeEscape never reaches this length? I
Manish Jethani 2018/07/11 19:04:41 Yes, they would be lost. If it's not at the end o
kzar 2018/07/12 10:30:36 Acknowledged.
+ {
+ let codePoint = parseInt(unicodeEscape, 16);
+ if (!isNaN(codePoint))
+ argument += String.fromCodePoint(codePoint);
+
+ unicodeEscape = null;
+ }
+ }
+ else if (escape)
+ {
+ escape = false;
+
+ if (character == "u")
+ unicodeEscape = "";
+ else
+ argument += singleCharacterEscapes.get(character) || character;
+ }
+ else if (character == "\\")
+ {
+ escape = true;
+ }
+ else if (character == "'")
+ {
+ literal = !literal;
+ }
+ else if (literal || character != ";" && !/\s/u.test(character))
kzar 2018/07/10 13:55:20 So the literal flag has no effect on escaped chara
Manish Jethani 2018/07/11 19:04:41 No, mainly because we need a way to escape the sin
kzar 2018/07/12 10:30:36 Acknowledged.
+ {
+ argument += character;
+ }
+ else
+ {
+ if (argument)
+ {
+ call.push(argument);
+ argument = "";
+ }
+
+ if (character == ";" && call.length > 0)
+ {
+ tree.push(call);
+ call = [];
+ }
+ }
+ }
+
+ return tree;
+}
+
+exports.parseScript = parseScript;
« no previous file with comments | « no previous file | test/snippets.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld