gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-22 08:45:45 +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

22
common/modules/commands.jsm
View File

@@ -798,7 +798,7 @@ var Commands = Module("commands", {
let lines = string.split(/\r\n|[\r\n]/);
let startLine = context.line;
for (var i = 0; i < lines.length && !context.finished; i++) {
for (let i = 0; i < lines.length && !context.finished; i++) {
// Deal with editors from Silly OSs.
let line = lines[i].replace(/\r$/, "");
@@ -834,10 +834,13 @@ var Commands = Module("commands", {
list: function list(filter, hives) {
const { commandline, completion } = this.modules;
function completerToString(completer) {
if (completer)
return [k
for ([k, v] of iter(config.completers))
if (completer == completion.bound[v])][0] || "custom";
if (completer) {
for (let [key, val] of Object.entries(config.completers))
if (completion.bound(val) === completer)
return key;
return "custom";
}
return "";
}
@@ -1567,6 +1570,7 @@ var Commands = Module("commands", {
for (var [command, args] of commands.parseCommands(context.filter, context))
if (args.trailing)
context.advance(args.commandString.length + 1);
if (!args)
args = { commandString: context.filter };
@@ -1749,7 +1753,8 @@ var Commands = Module("commands", {
names: ["-complete", "-C"],
description: "The argument completion function",
completer: function (context) {
return [[k, ""] for ([k, v] of iter(config.completers))];
return Object.entries(config.completers)
.map(([k, v]) => [k, ""]);
},
type: CommandOption.STRING,
validator: function (arg) {
@@ -1906,12 +1911,11 @@ var Commands = Module("commands", {
setCompleter([CommandHive.prototype.get,
CommandHive.prototype.remove],
[function () {
return [[c.names, c.description] for (c of this)];
return Array.from(this, cmd => [c.names, c.description]);
}]);
setCompleter([Commands.prototype.get],
[function () {
return [[c.names, c.description]
for (c of this.iterator())];
return Array.from(this.iterator(), cmd => [c.names, c.description]);
}]);
},
mappings: function initMappings(dactyl, modules, window) {