gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-13 08:25:46 +01:00
Code Issues Projects Releases Wiki Activity

Deal with debuggerless cr^wapps in JS completion.

Browse Source
This commit is contained in:
Kris Maglione
2009-11-14 01:21:38 -05:00
parent 86142105a1
commit be0228be64
2 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
common/content/base.js
View File

@@ -18,10 +18,28 @@ function array(obj) {
function allkeys(obj) {
let ret = {};
for (; obj; obj = obj.__proto__) {
services.get("debugger").wrapValue(obj).getProperties(ret, {});
for (let prop in values(ret.value))
yield prop.name.stringValue;
try {
for (; obj; obj = obj.__proto__) {
services.get("debugger").wrapValue(obj).getProperties(ret, {});
for (let prop in values(ret.value))
yield prop.name.stringValue;
}
return;
}
catch (e) {}
let __iterator__ = obj.__iterator__;
try {
if ('__iterator__' in obj) {
yield '__iterator__';
delete obj.__iterator__;
}
for (let k in obj)
yield k;
}
finally {
if (__iterator__)
obj.__iterator__ = __iterator__;
}
}

37
common/content/completion.js
View File

@@ -783,20 +783,35 @@ const Completion = Module("completion", {
}
this.iter = function iter(obj, toplevel) {
toplevel = !!toplevel;
let seen = {};
let ret = {};
let top = services.get("debugger").wrapValue(obj);
if (!toplevel)
obj = obj.__proto__;
for (; obj; obj = !toplevel && obj.__proto__) {
services.get("debugger").wrapValue(obj).getProperties(ret, {});
for (let prop in values(ret.value)) {
let name = '|' + prop.name.stringValue;
if (name in seen)
continue;
seen[name] = 1;
yield [prop.name.stringValue, top.getProperty(prop.name.stringValue).value.getWrappedValue()]
try {
let top = services.get("debugger").wrapValue(obj);
if (!toplevel)
obj = obj.__proto__;
for (; obj; obj = !toplevel && obj.__proto__) {
services.get("debugger").wrapValue(obj).getProperties(ret, {});
for (let prop in values(ret.value)) {
let name = '|' + prop.name.stringValue;
if (name in seen)
continue;
seen[name] = 1;
yield [prop.name.stringValue, top.getProperty(prop.name.stringValue).value.getWrappedValue()]
}
}
for (let k in obj) {
if (k in obj && !(k in seen) && obj.hasOwnProperty(k) == toplevel)
yield [k, getKey(obj, k)]
}
}
catch(e) {
for (k in allkeys(obj))
if (obj.hasOwnProperty(k) == toplevel)
yield [k, getKey(obj, k)];
}
};