gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-29 08:42:27 +01:00
Code Issues Projects Releases Wiki Activity

List links in :hi output; provide current/default value completion.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-30 00:46:28 -05:00
parent 1dd8efea4f
commit 4d47da9102
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/content/completion.js
View File

@@ -643,7 +643,7 @@ var CompletionContext = Class("CompletionContext", {
* interpreted as a method to access on *self*. * interpreted as a method to access on *self*.
*/ */
fork: function fork(name, offset, self, completer) { fork: function fork(name, offset, self, completer) {
if (typeof completer == "string") if (isString(completer))
completer = self[completer]; completer = self[completer];
let context = CompletionContext(this, name, offset); let context = CompletionContext(this, name, offset);
if (this.contextList.indexOf(context) < 0) if (this.contextList.indexOf(context) < 0)
@@ -654,7 +654,9 @@ var CompletionContext = Class("CompletionContext", {
else if (completer) { else if (completer) {
let res = completer.apply(self || this, [context].concat(Array.slice(arguments, fork.length))); let res = completer.apply(self || this, [context].concat(Array.slice(arguments, fork.length)));
if (res && !isArray(res) && !isArray(res.__proto__)) if (res && !isArray(res) && !isArray(res.__proto__))
return [k for (k in res)]; res = [k for (k in res)];
if (res)
context.completions = res;
return res; return res;
} }
if (completer) if (completer)

13
common/modules/highlight.jsm
View File

@@ -314,11 +314,12 @@ var Highlights = Module("Highlight", {
if (!modify) if (!modify)
modules.commandline.commandOutput( modules.commandline.commandOutput(
template.tabular(["Key", "Sample", "CSS"], template.tabular(["Key", "Sample", "Link", "CSS"],
["padding: 0 1em 0 0; vertical-align: top", ["padding: 0 1em 0 0; vertical-align: top",
"text-align: center"], "text-align: center"],
([h.class, ([h.class,
<span style={"text-align: center; line-height: 1em;" + h.value + style}>XXX</span>, <span style={"text-align: center; line-height: 1em;" + h.value + style}>XXX</span>,
template.map(h.extends, template.highlight),
template.highlightRegexp(h.value, /\b[-\w]+(?=:)/g)] template.highlightRegexp(h.value, /\b[-\w]+(?=:)/g)]
for (h in highlight) for (h in highlight)
if (!key || h.class.indexOf(key) > -1)))); if (!key || h.class.indexOf(key) > -1))));
@@ -353,7 +354,15 @@ var Highlights = Module("Highlight", {
names: ["-link", "-l"], names: ["-link", "-l"],
description: "Links this group to another", description: "Links this group to another",
type: CommandOption.LIST, type: CommandOption.LIST,
completer: function (context, args) completion.highlightGroup(context) completer: function (context, args) {
let group = args[0] && highlight.get(args[0]);
if (group)
context.fork("extra", 0, this, function (context) [
[String(group.extends), "Current Value"],
[String(group.defaultExtends) || "", "Default Value"]
]);
context.fork("groups", 0, completion, "highlightGroup");
}
} }
], ],
serialize: function () [ serialize: function () [