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

Usage command stuff.

Browse Source
This commit is contained in:
Kris Maglione
2011-05-22 15:56:25 -04:00
parent 9791cdb886
commit b4adf32663
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/content/dactyl.js
View File

@@ -181,6 +181,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
}, },
addUsageCommand: function (params) { addUsageCommand: function (params) {
function keys(item) (item.names || [item.name]).concat(item.description, item.columns || []);
let name = commands.add(params.name, params.description, let name = commands.add(params.name, params.description,
function (args) { function (args) {
let results = array(params.iterate(args)) let results = array(params.iterate(args))
@@ -188,7 +190,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
let filters = args.map(function (arg) util.regexp("\\b" + util.regexp.escape(arg) + "\\b", "i")); let filters = args.map(function (arg) util.regexp("\\b" + util.regexp.escape(arg) + "\\b", "i"));
if (filters.length) if (filters.length)
results = results.filter(function (item) filters.every(function (re) [item.name, item.description].concat(item.columns || []).some(re.closure.test))); results = results.filter(function (item) filters.every(function (re) keys(item).some(re.closure.test)));
commandline.commandOutput( commandline.commandOutput(
template.usage(results, params.format)); template.usage(results, params.format));
@@ -199,7 +201,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
context.keys.text = util.identity; context.keys.text = util.identity;
context.keys.description = function () seen[this.text] + /*L*/" matching items"; context.keys.description = function () seen[this.text] + /*L*/" matching items";
let seen = {}; let seen = {};
context.completions = array(item.description.toLowerCase().split(/[()\s]+/) context.completions = array(keys(item).join(" ").toLowerCase().split(/[()\s]+/)
for (item in params.iterate(args))) for (item in params.iterate(args)))
.flatten().filter(function (w) /^\w[\w-_']+$/.test(w)) .flatten().filter(function (w) /^\w[\w-_']+$/.test(w))
.map(function (k) { .map(function (k) {