gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 17:32:25 +01:00
Code Issues Projects Releases Wiki Activity

Context-specific completer options. Option refactoring.

Browse Source 
New review
Owner: dougkearns
Hopefully the changeset hash will actually be linked this time. If
not, it's the tip of the testing branch, presumably r4161.
I've been meaning to do this for a while. It allows case matching,
sorting, and auto completion options to be assigned on a per context
basis, with fine grained control. It also adds builtin regex support
to options since it's used fairly extensively. There are definitely
other options that would benefit from the regexlist type, if I can
dig them up. The interface (and perhaps the doc wording) is the only
place I'm really ambivalent.

--HG--
branch : testing
This commit is contained in:
Kris Maglione
2009-11-20 15:37:39 -05:00
parent db1fb981cc
commit 61002641a3
14 changed files with 469 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
common/content/completion.js
View File

@@ -34,6 +34,11 @@ const CompletionContext = Class("CompletionContext", {
if (editor instanceof this.constructor) {
let parent = editor;
name = parent.name + "/" + name;
this.autoComplete = options.get("autocomplete").getKey(name);
this.sortResults = options.get("wildsort").getKey(name);
this.wildcase = options.get("wildcase").getKey(name);
this.contexts = parent.contexts;
if (name in this.contexts)
self = this.contexts[name];
@@ -146,6 +151,8 @@ const CompletionContext = Class("CompletionContext", {
this.top = this;
this.__defineGetter__("incomplete", function () this.contextList.some(function (c) c.parent && c.incomplete));
this.__defineGetter__("waitingForTab", function () this.contextList.some(function (c) c.parent && c.waitingForTab));
this.__defineSetter__("incomplete", function (val) {});
this.__defineSetter__("waitingForTab", function (val) {});
this.reset();
}
/**
@@ -333,7 +340,7 @@ const CompletionContext = Class("CompletionContext", {
get ignoreCase() {
if ("_ignoreCase" in this)
return this._ignoreCase;
let mode = options["wildcase"];
let mode = this.wildcase;
if (mode == "match")
return this._ignoreCase = false;
if (mode == "ignore")
@@ -367,7 +374,7 @@ const CompletionContext = Class("CompletionContext", {
if (this.maxItems)
filtered = filtered.slice(0, this.maxItems);
if (options.get("wildoptions").has("sort") && this.compare)
if (this.sortResults && this.compare)
filtered.sort(this.compare);
let quote = this.quote;
if (quote)
@@ -498,8 +505,14 @@ const CompletionContext = Class("CompletionContext", {
completer = self[completer];
let context = CompletionContext(this, name, offset);
this.contextList.push(context);
if (completer)
if (!context.autoComplete && !context.tabPressed && context.editor)
context.waitingForTab = true;
else if (completer)
return completer.apply(self || this, [context].concat(Array.slice(arguments, arguments.callee.length)));
if (completer)
return null;
return context;
},
@@ -741,6 +754,80 @@ const Completion = Module("completion", {
//}}}
}, {
UrlCompleter: Struct("name", "description", "completer")
}, {
commands: function () {
commands.add(["contexts"],
"List the completion contexts used during completion of an ex command",
function (args) {
commandline.echo(template.commandOutput(
<div highlight="Completions">
{ template.completionRow(["Context", "Title"], "CompTitle") }
{ template.map(completion.contextList || [], function (item) template.completionRow(item, "CompItem")) }
</div>),
null, commandline.FORCE_MULTILINE);
},
{
argCount: "1",
completer: function (context, args) {
let PREFIX = "/ex/contexts";
context.fork("ex", 0, completion, "ex");
completion.contextList = [[k.substr(PREFIX.length), v.title[0]] for ([k, v] in iter(context.contexts)) if (k.substr(0, PREFIX.length) == PREFIX)];
},
literal: 0
});
},
options: function () {
options.add(["autocomplete", "au"],
"Automatically update the completion list on any key press",
"regexlist", ".*");
options.add(["complete", "cpt"],
"Items which are completed at the :open prompts",
"charlist", typeof(config.defaults["complete"]) == "string" ? config.defaults["complete"] : "slf",
{
completer: function (context) array(values(completion.urlCompleters))
});
options.add(["wildcase", "wic"],
"Completion case matching mode",
"regexmap", "smart",
{
completer: function () [
["smart", "Case is significant when capital letters are typed"],
["match", "Case is always significant"],
["ignore", "Case is never significant"]
]
});
options.add(["wildmode", "wim"],
"Define how command line completion works",
"stringlist", "list:full",
{
completer: function (context) [
// Why do we need ""?
// Because its description is useful during completion. --Kris
["", "Complete only the first match"],
["full", "Complete the next full match"],
["longest", "Complete to longest common string"],
["list", "If more than one match, list all matches"],
["list:full", "List all and complete first match"],
["list:longest", "List all and complete common string"]
],
checkHas: function (value, val) {
let [first, second] = value.split(":", 2);
return first == val || second == val;
},
has: function () {
test = function (val) this.values.some(function (value) this.checkHas(value, val), this);
return Array.some(arguments, test, this);
}
});
options.add(["wildsort", "wis"],
"Regexp list of which contexts to sort",
"regexlist", ".*");
}
});
// vim: set fdm=marker sw=4 ts=4 et: