@theia/memory-inspector 1.34.0-next.19 → 1.34.0-next.34
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/memory-provider/cdt-gdb-memory-provider.d.ts.map +1 -1
- package/lib/browser/memory-provider/cdt-gdb-memory-provider.js +8 -2
- package/lib/browser/memory-provider/cdt-gdb-memory-provider.js.map +1 -1
- package/package.json +4 -4
- package/src/browser/memory-provider/cdt-gdb-memory-provider.ts +7 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cdt-gdb-memory-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/memory-provider/cdt-gdb-memory-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAc,aAAa,EAAE,MAAM,sDAAsD,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAEtE,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAE3D;;;;;GAKG;AAEH;;;GAGG;AACH,qBACa,oBAAqB,SAAQ,sBAAsB;IAE5D,SAAS,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO;IAI1B,SAAS,CAAC,OAAO,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"cdt-gdb-memory-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/memory-provider/cdt-gdb-memory-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAc,aAAa,EAAE,MAAM,sDAAsD,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAEtE,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAE3D;;;;;GAKG;AAEH;;;GAGG;AACH,qBACa,oBAAqB,SAAQ,sBAAsB;IAE5D,SAAS,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO;IAI1B,SAAS,CAAC,OAAO,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA2D5E,+BAA+B,CAAC,OAAO,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,aAAa,GAAG,OAAO;IAa7F,uBAAuB,CAAC,OAAO,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,aAAa,GAAG,MAAM;CAkBhG"}
|
|
@@ -62,12 +62,18 @@ let CDTGDBMemoryProvider = class CDTGDBMemoryProvider extends memory_provider_1.
|
|
|
62
62
|
expression: addrExp,
|
|
63
63
|
context: 'watch',
|
|
64
64
|
frameId: frame.raw.id,
|
|
65
|
-
});
|
|
65
|
+
}).catch(e => { console.warn(`Failed to evaluate ${addrExp}. Corresponding variable will be omitted from Memory Inspector display.`, e); });
|
|
66
|
+
if (!addrResp) {
|
|
67
|
+
continue;
|
|
68
|
+
}
|
|
66
69
|
const sizeResp = await session.sendRequest('evaluate', {
|
|
67
70
|
expression: sizeExp,
|
|
68
71
|
context: 'watch',
|
|
69
72
|
frameId: frame.raw.id,
|
|
70
|
-
});
|
|
73
|
+
}).catch(e => { console.warn(`Failed to evaluate ${sizeExp}. Corresponding variable will be omitted from Memory Inspector display.`, e); });
|
|
74
|
+
if (!sizeResp) {
|
|
75
|
+
continue;
|
|
76
|
+
}
|
|
71
77
|
// Make sure the address is in the format we expect.
|
|
72
78
|
const addressPart = /0x[0-9a-f]+/i.exec(addrResp.body.result);
|
|
73
79
|
if (!addressPart) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cdt-gdb-memory-provider.js","sourceRoot":"","sources":["../../../src/browser/memory-provider/cdt-gdb-memory-provider.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,4DAA0D;AAC1D,8FAAiG;AAEjG,4CAAyD;AAEzD,uDAA2D;AAE3D;;;;;GAKG;AAEH;;;GAGG;AAEH,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,wCAAsB;IAE5D,SAAS,CAAC,OAAqB;QAC3B,OAAO,OAAO,CAAC,aAAa,CAAC,IAAI,KAAK,KAAK,CAAC;IAChD,CAAC;IAEQ,KAAK,CAAC,SAAS,CAAC,OAAiC;QACtD,IAAI,OAAO,KAAK,SAAS,EAAE;YACvB,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACzC,OAAO,EAAE,CAAC;SACb;QAED,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC;QACnC,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC7C;QAED,MAAM,MAAM,GAAoB,EAAE,CAAC;QAEnC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC;QACvC,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,WAAW,CAAC,CAAC;QAC9E,KAAK,MAAM,KAAK,IAAI,sBAAsB,EAAE;YACxC,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC;YAC5C,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE;gBACvB,IAAI,CAAC,YAAY,mCAAa,EAAE;oBAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;oBAC7B,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,IAAI,GAAG,CAAC;oBACpC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE;wBACnD,UAAU,EAAE,OAAO;wBACnB,OAAO,EAAE,OAAO;wBAChB,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;qBACxB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cdt-gdb-memory-provider.js","sourceRoot":"","sources":["../../../src/browser/memory-provider/cdt-gdb-memory-provider.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,4DAA0D;AAC1D,8FAAiG;AAEjG,4CAAyD;AAEzD,uDAA2D;AAE3D;;;;;GAKG;AAEH;;;GAGG;AAEH,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,wCAAsB;IAE5D,SAAS,CAAC,OAAqB;QAC3B,OAAO,OAAO,CAAC,aAAa,CAAC,IAAI,KAAK,KAAK,CAAC;IAChD,CAAC;IAEQ,KAAK,CAAC,SAAS,CAAC,OAAiC;QACtD,IAAI,OAAO,KAAK,SAAS,EAAE;YACvB,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACzC,OAAO,EAAE,CAAC;SACb;QAED,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC;QACnC,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC7C;QAED,MAAM,MAAM,GAAoB,EAAE,CAAC;QAEnC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC;QACvC,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,WAAW,CAAC,CAAC;QAC9E,KAAK,MAAM,KAAK,IAAI,sBAAsB,EAAE;YACxC,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC;YAC5C,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE;gBACvB,IAAI,CAAC,YAAY,mCAAa,EAAE;oBAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;oBAC7B,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,IAAI,GAAG,CAAC;oBACpC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE;wBACnD,UAAU,EAAE,OAAO;wBACnB,OAAO,EAAE,OAAO;wBAChB,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;qBACxB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,OAAO,yEAAyE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC5I,IAAI,CAAC,QAAQ,EAAE;wBAAE,SAAS;qBAAE;oBAE5B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE;wBACnD,UAAU,EAAE,OAAO;wBACnB,OAAO,EAAE,OAAO;wBAChB,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;qBACxB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,OAAO,yEAAyE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC5I,IAAI,CAAC,QAAQ,EAAE;wBAAE,SAAS;qBAAE;oBAE5B,oDAAoD;oBACpD,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC9D,IAAI,CAAC,WAAW,EAAE;wBAAE,SAAS;qBAAE;oBAE/B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;wBAAE,SAAS;qBAAE;oBAEzD,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC5C,MAAM,OAAO,GAAG,IAAA,2BAAoB,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrD,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAE5C,MAAM,CAAC,IAAI,CAAC;wBACR,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,OAAO;wBACP,iBAAiB;wBACjB,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,KAAK,EAAE,CAAC,CAAC,KAAK;qBACjB,CAAC,CAAC;iBACN;aACJ;SACJ;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAEQ,+BAA+B,CAAC,OAAqB,EAAE,YAA4B;QACxF,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;YACzB,IAAI,CAAC,YAAY,EAAE;gBACf,OAAO,KAAK,CAAC;aAChB;YACD,OAAO,YAAY,CAAC,MAAM,YAAY,mCAAa,EAAE;gBACjD,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;aACtC;YACD,OAAO,YAAY,CAAC,MAAM,YAAY,gCAAU,IAAI,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;SACnG;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,uBAAuB,CAAC,OAAqB,EAAE,YAA4B;QAChF,IAAI,YAAY,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;YACzC,IAAI,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC;YAC5B,OAAO,YAAY,CAAC,MAAM,YAAY,mCAAa,EAAE;gBACjD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;gBAClD,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;gBACnC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,YAAY,CAAC,IAAI,GAAG,CAAC,EAAE,EAAE,mDAAmD;oBAChG,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,YAAY,CAAC,IAAI,GAAG,EAAE,KAAK,YAAY,CAAC,IAAI,KAAK,CAAC,CAAC;iBAC9E;qBAAM,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,EAAE;oBACjD,2EAA2E;iBAC9E;qBAAM;oBACH,IAAI,GAAG,GAAG,YAAY,CAAC,IAAI,GAAG,SAAS,GAAG,IAAI,EAAE,CAAC;iBACpD;aACJ;YACD,OAAO,KAAK,IAAI,GAAG,CAAC;SACvB;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;AAhGY,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAgGhC;AAhGY,oDAAoB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/memory-inspector",
|
|
3
|
-
"version": "1.34.0-next.
|
|
3
|
+
"version": "1.34.0-next.34+00564d6ea",
|
|
4
4
|
"description": "Theia - Memory Inspector",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"theia-extension"
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
"watch": "theiaext watch"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@theia/core": "1.34.0-next.
|
|
31
|
-
"@theia/debug": "1.34.0-next.
|
|
30
|
+
"@theia/core": "1.34.0-next.34+00564d6ea",
|
|
31
|
+
"@theia/debug": "1.34.0-next.34+00564d6ea",
|
|
32
32
|
"@vscode/debugprotocol": "^1.51.0",
|
|
33
33
|
"long": "^4.0.0"
|
|
34
34
|
},
|
|
@@ -43,5 +43,5 @@
|
|
|
43
43
|
"publishConfig": {
|
|
44
44
|
"access": "public"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "00564d6ea679bd23266081ad780b52e841f3f699"
|
|
47
47
|
}
|
|
@@ -64,22 +64,21 @@ export class CDTGDBMemoryProvider extends AbstractMemoryProvider {
|
|
|
64
64
|
expression: addrExp,
|
|
65
65
|
context: 'watch',
|
|
66
66
|
frameId: frame.raw.id,
|
|
67
|
-
});
|
|
67
|
+
}).catch(e => { console.warn(`Failed to evaluate ${addrExp}. Corresponding variable will be omitted from Memory Inspector display.`, e); });
|
|
68
|
+
if (!addrResp) { continue; }
|
|
69
|
+
|
|
68
70
|
const sizeResp = await session.sendRequest('evaluate', {
|
|
69
71
|
expression: sizeExp,
|
|
70
72
|
context: 'watch',
|
|
71
73
|
frameId: frame.raw.id,
|
|
72
|
-
});
|
|
74
|
+
}).catch(e => { console.warn(`Failed to evaluate ${sizeExp}. Corresponding variable will be omitted from Memory Inspector display.`, e); });
|
|
75
|
+
if (!sizeResp) { continue; }
|
|
73
76
|
|
|
74
77
|
// Make sure the address is in the format we expect.
|
|
75
78
|
const addressPart = /0x[0-9a-f]+/i.exec(addrResp.body.result);
|
|
76
|
-
if (!addressPart) {
|
|
77
|
-
continue;
|
|
78
|
-
}
|
|
79
|
+
if (!addressPart) { continue; }
|
|
79
80
|
|
|
80
|
-
if (!/^[0-9]+$/.test(sizeResp.body.result)) {
|
|
81
|
-
continue;
|
|
82
|
-
}
|
|
81
|
+
if (!/^[0-9]+$/.test(sizeResp.body.result)) { continue; }
|
|
83
82
|
|
|
84
83
|
const size = parseInt(sizeResp.body.result);
|
|
85
84
|
const address = hexStrToUnsignedLong(addressPart[0]);
|