github/android-dev-ext
1
1
Fork 0
mirror of https://github.com/adelphes/android-dev-ext.git synced 2025-12-22 17:39:19 +00:00
Code Issues 41 Packages Projects Releases Wiki Activity

add support for evaluateName so Add To Watch works again

Browse Source
This commit is contained in:
adelphes
2017-06-24 13:16:36 +01:00
parent 261c06f1d6
commit 4a31b83eb9
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/variables.js
View File

@@ -79,6 +79,8 @@ class AndroidVariables {
value: x.varinfo.objvar.value, value: x.varinfo.objvar.value,
valid:true, valid:true,
}); });
// create the fully qualified names to use for evaluation
fields.forEach(f => f.fqname = `${x.varinfo.objvar.fqname || x.varinfo.objvar.name}.${f.name}`);
x.varinfo.cached = fields; x.varinfo.cached = fields;
return this._local_to_variable(fields); return this._local_to_variable(fields);
}); });
@@ -100,9 +102,10 @@ class AndroidVariables {
return $.Deferred().resolve(variables); return $.Deferred().resolve(variables);
} }
// get the elements for the specified range // get the elements for the specified range
return this.dbgr.getarrayvalues(varinfo.arrvar, range[0], count) return this.dbgr.getarrayvalues(varinfo.arrvar, range[0], count, {varinfo})
.then((elements) => { .then((elements, x) => {
varinfo.cached = elements; elements.forEach(el => el.fqname = `${x.varinfo.arrvar.name}[${el.name}]`);
x.varinfo.cached = elements;
return this._local_to_variable(elements); return this._local_to_variable(elements);
}); });
} }
@@ -158,7 +161,7 @@ class AndroidVariables {
*/ */
_local_to_variable(v) { _local_to_variable(v) {
if (Array.isArray(v)) return v.filter(v => v.valid).map(v => this._local_to_variable(v)); if (Array.isArray(v)) return v.filter(v => v.valid).map(v => this._local_to_variable(v));
var varref = 0, objvalue, formats = {}, typename = v.type.package ? `${v.type.package}.${v.type.typename}` : v.type.typename; var varref = 0, objvalue, evaluateName = v.fqname || v.name, formats = {}, typename = v.type.package ? `${v.type.package}.${v.type.typename}` : v.type.typename;
switch(true) { switch(true) {
case v.hasnullvalue && JTYPES.isReference(v.type): case v.hasnullvalue && JTYPES.isReference(v.type):
// null object or array type // null object or array type
@@ -240,6 +243,7 @@ class AndroidVariables {
name: v.name, name: v.name,
type: typename, type: typename,
value: objvalue, value: objvalue,
evaluateName,
variablesReference: varref, variablesReference: varref,
} }
} }