github/android-dev-ext
1
1
Fork 0
mirror of https://github.com/adelphes/android-dev-ext.git synced 2025-12-23 01:48:18 +00:00
Code Issues 41 Packages Projects Releases Wiki Activity

Improve breakpoint searching

Browse Source 
Search for inner types when identifying breakpoint locations
This commit is contained in:
adelphes
2017-02-01 10:13:02 +00:00
parent d1ab9a8339
commit 7b670b36ad
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/debugger.js
View File

@@ -587,11 +587,26 @@ Debugger.prototype = {
// try and load the class - if the runtime hasn't loaded it yet, this will just return an empty classes object // try and load the class - if the runtime hasn't loaded it yet, this will just return an empty classes object
return this._loadclzinfo('L'+newbp.qtype+';') return this._loadclzinfo('L'+newbp.qtype+';')
.then(classes => { .then(classes => {
if (!Object.keys(classes).length)
return this._ensureClassPrepareForPackage(newbp.pkg);
var bploc = this._findbplocation(classes, newbp); var bploc = this._findbplocation(classes, newbp);
if (bploc) if (!bploc) {
return this._setupbreakpointsevent([bploc]); // the required location may be inside a nested class (anonymous or named)
// Since Android doesn't support the NestedTypes JDWP call (ffs), all we can do here
// is look for existing (cached) loaded types matching inner type signatures
for (var sig in this.session.classes) {
if (newbp.sigpattern.test(sig))
classes[sig] = this.session.classes[sig];
}
// try again
bploc = this._findbplocation(classes, newbp);
}
if (!bploc) {
// we couldn't identify a matching location - either the class is not yet loaded or the
// location doesn't correspond to any code. In case it's the former, make sure we are notified
// when classes in this package are loaded
return this._ensureClassPrepareForPackage(newbp.pkg);
}
// we found a matching location - set the breakpoint event
return this._setupbreakpointsevent([bploc]);
}) })
.then(() => newbp) .then(() => newbp)
case 'connecting': case 'connecting':