Skip to content

[wasm][debugger] Remove JToken properties that are for internal use only #75958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ilonatommy merged 10 commits into from
Oct 19, 2022
Merged

[wasm][debugger] Remove JToken properties that are for internal use only #75958

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
93911d9
Keep underscore removable properties as constants.
ilonatommy Sep 29, 2022
5765bed
Clean up before exposing externally.
ilonatommy Sep 29, 2022
00ff482
Value types need cleanup as well.
ilonatommy Sep 30, 2022
14a2be2
Fixed RootHidden tests.
ilonatommy Sep 30, 2022
c1396f7
Merge branch 'main' into remove-underscore-fields
ilonatommy Sep 30, 2022
c49e7ea
Applied a variation of @radical's idea.
ilonatommy Oct 12, 2022
8c77f58
Fix tests.
ilonatommy Oct 12, 2022
ea381f8
Reverted to @radical's version.
ilonatommy Oct 13, 2022
0effee7
Revert 14a2be2eca82e0848e73130d7a8405e0f99f62bd.
ilonatommy Oct 14, 2022
bf636fd
Applied radical's suggestions.
ilonatommy Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert 14a2be2.
  • Loading branch information
@ilonatommy
ilonatommy committed Oct 14, 2022
commit 0effee7a52770dd945b72cfe5b6ad1be3d78e5e9
9 changes: 2 additions & 7 deletions src/mono/wasm/debugger/BrowserDebugProxy/MemberObjectsExplorer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,6 @@ private static async Task<JArray> GetRootHiddenChildren(
if (rootValue?["type"]?.Value<string>() != "object")
return new JArray();

int? maxSize = null;

// unpack object/valuetype
if (rootObjectId.Scheme is "object" or "valuetype")
{
Expand All @@ -152,9 +150,8 @@ private static async Task<JArray> GetRootHiddenChildren(
{
// a collection - expose elements to be of array scheme
var memberNamedItems = members
.FirstOrDefault(m => m["name"]?.Value<string>() == "Items" || m["name"]?.Value<string>() == "_items");
// sometimes items have dummy empty elements added after real items
maxSize = members.FirstOrDefault(m => m["name"]?.Value<string>() == "_size")?["value"]?["value"]?.Value<int>();
.Where(m => m["name"]?.Value<string>() == "Items" || m["name"]?.Value<string>() == "_items")
.FirstOrDefault();
if (memberNamedItems is not null &&
(DotnetObjectId.TryParse(memberNamedItems["value"]?["objectId"]?.Value<string>(), out DotnetObjectId itemsObjectId)) &&
itemsObjectId.Scheme == "array")
Expand All @@ -167,8 +164,6 @@ private static async Task<JArray> GetRootHiddenChildren(
if (rootObjectId.Scheme == "array")
{
JArray resultValue = await sdbHelper.GetArrayValues(rootObjectId.Value, token);
if (maxSize is not null)
resultValue = new JArray(resultValue.Take(maxSize.Value));

// root hidden item name has to be unique, so we concatenate the root's name to it
foreach (var item in resultValue)
Expand Down
3 changes: 0 additions & 3 deletions src/mono/wasm/debugger/DebuggerTestSuite/EvaluateOnCallFrameTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,9 +1183,6 @@ public async Task EvaluateBrowsableRootHidden(
var list = refListProp
.FirstOrDefault(v => v["name"]?.Value<string>() == "Items" || v["name"]?.Value<string>() == "_items");
var refListElementsProp = await GetProperties(list["value"]["objectId"]?.Value<string>());
int? listMaxSize = refListProp.FirstOrDefault(m => m["name"]?.Value<string>() == "_size")?["value"]?["value"]?.Value<int>();
if (listMaxSize is not null)
refListElementsProp = new JArray(refListElementsProp.Take(listMaxSize.Value));

var (refArray, _) = await EvaluateOnCallFrame(id, "testPropertiesNone.array");
var refArrayProp = await GetProperties(refArray["objectId"]?.Value<string>());
Expand Down