gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-16 01:45:46 +01:00
Code Issues Projects Releases Wiki Activity

Get rid of most remaining comprehensions.

Browse Source
This commit is contained in:
Kris Maglione
2015-12-20 15:53:43 -08:00
parent 0aba8fb619
commit 916ea412a5
34 changed files with 372 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
common/modules/util.jsm
View File

@@ -818,8 +818,9 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
}
if (isObject(params.params)) {
let data = [encodeURIComponent(k) + "=" + encodeURIComponent(v)
for ([k, v] of iter(params.params))];
let encode = ([key, val]) => `${encodeURIComponent(key)}=${encodeURIComponent(val)}`;
let data = Object.entries(params).map(encode);
let uri = util.newURI(url);
uri.query += (uri.query ? "&" : "") + data.join("&");
@@ -1307,8 +1308,14 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
* @returns {RegExp} A custom regexp object.
*/
regexp: update(function (expr, flags, tokens) {
flags = flags || [k for ([k, v] of iter({ g: "global", i: "ignorecase", m: "multiline", y: "sticky" }))
if (expr[v])].join("");
if (!flags)
flags = Object.entries({ g: "global",
i: "ignorecase",
m: "multiline",
y: "sticky" })
.filter(([short, full]) => expr[full])
.map(([short]) => short)
.join("");
if (isinstance(expr, ["RegExp"]))
expr = expr.source;
@@ -1472,7 +1479,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
this.errors.push([new Date, obj + "\n" + obj.stack]);
this.errors = this.errors.slice(-this.maxErrors);
this.errors.toString = function () {
return [k + "\n" + v for ([k, v] of this)].join("\n\n");
return this.map(([name, stack]) => `${name}\n${stack}\n`)
.join("\n");
};
this.dump(String(error));
@@ -1510,9 +1518,11 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
}
catch (e) {}
let ary = host.split(".");
ary = [ary.slice(i).join(".") for (i of util.range(ary.length, 0, -1))];
return ary.filter(h => h.length >= base.length);
let parts = host.split(".");
return Array.from(util.range(parts.length, 0, -1),
i => parts.slice(i).join("."))
.filter(host => host.length >= base.length);
},
/**