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

Fix completion for things like Cc[foo+"bar]; for a certain value of fix.

Browse Source
This commit is contained in:
Kris Maglione
2010-09-30 09:54:46 -04:00
parent 23458b23d8
commit fe429284d1
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
common/content/javascript.js
View File

@@ -299,12 +299,16 @@ const JavaScript = Module("javascript", {
context.itemCache = context.parent.itemCache; context.itemCache = context.parent.itemCache;
context.key = args.name + args.last; context.key = args.name + args.last;
if (args.last != null) if (args.last == null)
context.quote = [args.last, function (text) util.escapeString(text.substr(args.offset), ""), args.last]; // We're not looking for a quoted string, so filter out anything that's not a valid identifier
else // We're not looking for a quoted string, so filter out anything that's not a valid identifier
context.filters.push(function (item) /^[a-zA-Z_$][\w$]*$/.test(item.text)); context.filters.push(function (item) /^[a-zA-Z_$][\w$]*$/.test(item.text));
else {
context.quote = [args.last, function (text) util.escapeString(text, ""), args.last];
if (args.prefix)
context.filters.push(function (item) item.item.indexOf(args.prefix) === 0);
}
args.completer.call(self, context, args.obj); args.completer.call(self, context, args);
}, },
_complete: function (objects, key, compl, string, last) { _complete: function (objects, key, compl, string, last) {
@@ -315,7 +319,7 @@ const JavaScript = Module("javascript", {
let orig = compl; let orig = compl;
if (!compl) { if (!compl) {
compl = function (context, obj, recurse) { compl = function (context, args, recurse) {
context.process[1] = function highlight(item, v) context.process[1] = function highlight(item, v)
template.highlight(typeof v == "xml" ? new String(v.toXMLString()) : v, true); template.highlight(typeof v == "xml" ? new String(v.toXMLString()) : v, true);
@@ -332,8 +336,8 @@ const JavaScript = Module("javascript", {
return isnan(b.key) - isnan(a.key) || compare(a, b); return isnan(b.key) - isnan(a.key) || compare(a, b);
}; };
context.keys = { context.keys = {
text: util.identity, text: args.prefix ? function (text) text.substr(args.prefix.length) : util.identity,
description: function (item) self.getKey(obj, item), description: function (item) self.getKey(args.obj, item),
key: function (item) { key: function (item) {
if (!isNaN(key)) if (!isNaN(key))
return parseInt(key); return parseInt(key);
@@ -345,18 +349,18 @@ const JavaScript = Module("javascript", {
if (!context.anchored) // We've already listed anchored matches, so don't list them again here. if (!context.anchored) // We've already listed anchored matches, so don't list them again here.
context.filters.push(function (item) util.compareIgnoreCase(item.text.substr(0, this.filter.length), this.filter)); context.filters.push(function (item) util.compareIgnoreCase(item.text.substr(0, this.filter.length), this.filter));
if (obj == self.cache.evalContext) if (args.obj == self.cache.evalContext)
context.regenerate = true; context.regenerate = true;
context.generate = function () self.objectKeys(obj, !recurse); context.generate = function () self.objectKeys(args.obj, !recurse);
}; };
} }
let args = { let args = {
completer: compl, completer: compl,
anchored: true, anchored: true,
filter: key + (string || ""), filter: string || "",
last: last, last: last,
offset: key.length prefix: key || ""
}; };
this.context.forceAnchored = true; this.context.forceAnchored = true;
@@ -402,7 +406,7 @@ const JavaScript = Module("javascript", {
if (this._last == "") if (this._last == "")
return ""; return "";
// After the opening [ upto the opening ", plus '' to take care of any operators before it // After the opening [ upto the opening ", plus '' to take care of any operators before it
let key = this._str.substring(this._get(-2, 0, "statements"), this._get(-1, null, "offset")) + "''"; let key = this._str.substring(this._get(-2, null, "offset") + 1, this._get(-1, null, "offset")) + "''";
// Now eval the key, to process any referenced variables. // Now eval the key, to process any referenced variables.
return this.evalled(key); return this.evalled(key);
}, },
@@ -440,6 +444,8 @@ const JavaScript = Module("javascript", {
prev = v + 1; prev = v + 1;
} }
// If this is a function argument, try to get the function's
// prototype and show it.
try { try {
let i = (this._get(-2) && this._get(-2).char == "(") ? -2 : -1; let i = (this._get(-2) && this._get(-2).char == "(") ? -2 : -1;
if (this._get(i).char == "(") { if (this._get(i).char == "(") {
@@ -483,7 +489,7 @@ const JavaScript = Module("javascript", {
// Yes. If the [ starts at the beginning of a logical // Yes. If the [ starts at the beginning of a logical
// statement, we're in an array literal, and we're done. // statement, we're in an array literal, and we're done.
if (this._get(-3, 0, "statements") == this._get(-2).offset) if (this._get(-3, 0, "statements") == this._get(-2).offset)
return null; return null;
// Beginning of the statement upto the opening [ // Beginning of the statement upto the opening [

4
common/modules/base.jsm
View File

@@ -567,9 +567,9 @@ function update(target) {
let src = arguments[i]; let src = arguments[i];
Object.getOwnPropertyNames(src || {}).forEach(function (k) { Object.getOwnPropertyNames(src || {}).forEach(function (k) {
let desc = Object.getOwnPropertyDescriptor(src, k); let desc = Object.getOwnPropertyDescriptor(src, k);
if (desc.value && desc.value instanceof Class.Property) if (desc.value instanceof Class.Property)
desc = desc.value.init(k) || desc.value; desc = desc.value.init(k) || desc.value;
if (desc.value && callable(desc.value) && Object.getPrototypeOf(target)) { if (typeof desc.value == "function" && Object.getPrototypeOf(target)) {
let func = desc.value; let func = desc.value;
desc.value.superapply = function (self, args) desc.value.superapply = function (self, args)
Object.getPrototypeOf(target)[k].apply(self, args); Object.getPrototypeOf(target)[k].apply(self, args);