Skip to content

[debugger][wasm] Support DebuggerProxyAttribute #56872

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
thaystg merged 15 commits into from
Aug 16, 2021
Merged

[debugger][wasm] Support DebuggerProxyAttribute #56872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7e985d2
Implementing debugger proxy
thaystg Aug 4, 2021
33652d5
Merge remote-tracking branch 'origin/main' into thays_implement_debug…
thaystg Aug 4, 2021
f56ef84
Merge remote-tracking branch 'origin/main' into thays_implement_debug…
thaystg Aug 4, 2021
3a55e21
fix compilation
thaystg Aug 4, 2021
394e3f6
Implement debuggerproxy attribute.
thaystg Aug 4, 2021
79e81ff
Reusing code for DebuggerProxy method and DebuggerDisplay method.
thaystg Aug 4, 2021
6c0abf2
Fix unit tests.
thaystg Aug 4, 2021
19d6864
Fixing unit tests that uses List<T>.
thaystg Aug 4, 2021
b1a32b5
Fix unit tests that uses List.
thaystg Aug 5, 2021
3091b2f
Addressing @radical comments.
thaystg Aug 6, 2021
de72265
Using flags enum as suggested by @lewing.
thaystg Aug 6, 2021
a0a420e
Merge branch 'main' into thays_implement_debugger_proxy_attribute
lewing Aug 7, 2021
31eff80
Fixing merge.
thaystg Aug 9, 2021
427b1f2
Addressing @radical comments.
thaystg Aug 12, 2021
9d6b705
Addressing @radical comments.
thaystg Aug 16, 2021
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
Addressing @radical comments.
  • Loading branch information
@thaystg
thaystg committed Aug 12, 2021
commit 427b1f23b6c1e2ad22c659e016a02cd00e5bb882
16 changes: 5 additions & 11 deletions src/mono/wasm/debugger/BrowserDebugProxy/EvaluateExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ private object ConvertJSToCSharpType(JToken variable)
case "boolean":
return value?.Value<bool>();
case "object":
return null;
return variable;
Copy link
Member

@radical radical Aug 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests needed for this

case "void":
return null;
}
Expand Down Expand Up @@ -396,19 +396,13 @@ private static object ConvertCSharpToJSType(object v, ITypeSymbol type)
{
if (v == null)
return new { type = "object", subtype = "null", className = type.ToString(), description = type.ToString() };

if (v is string s)
{
return new { type = "string", value = s, description = s };
}
else if (NumericTypes.Contains(v.GetType()))
{
if (NumericTypes.Contains(v.GetType()))
return new { type = "number", value = v, description = v.ToString() };
}
else
{
return new { type = "object", value = v, description = v.ToString(), className = type.ToString() };
}
if (v is JObject)
return v;
return new { type = "object", value = v, description = v.ToString(), className = type.ToString() };
}

}
Expand Down
37 changes: 31 additions & 6 deletions src/mono/wasm/debugger/BrowserDebugProxy/MemberReferenceResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public async Task<JObject> TryToRunOnLoadedClasses(string varName, CancellationT
classNameToFind += part.Trim();
if (typeId != -1)
{
var fields = await proxy.SdbHelper.GetTypeFields(sessionId, typeId, false, token);
var fields = await proxy.SdbHelper.GetTypeFields(sessionId, typeId, onlyPublic: false, token);
foreach (var field in fields)
{
if (field.Name == part.Trim())
Expand Down Expand Up @@ -204,6 +204,7 @@ public async Task<JObject> Resolve(string varName, CancellationToken token)
public async Task<JObject> Resolve(InvocationExpressionSyntax method, Dictionary<string, JObject> memberAccessValues, CancellationToken token)
{
var methodName = "";
int isTryingLinq = 0;
try
{
JObject rootObject = null;
Expand All @@ -223,18 +224,42 @@ public async Task<JObject> Resolve(InvocationExpressionSyntax method, Dictionary
if (rootObject != null)
{
DotnetObjectId.TryParse(rootObject?["objectId"]?.Value<string>(), out DotnetObjectId objectId);
var typeId = await proxy.SdbHelper.GetTypeIdFromObject(sessionId, int.Parse(objectId.Value), true, token);
int methodId = await proxy.SdbHelper.GetMethodIdByName(sessionId, typeId[0], methodName, token);
var typeIds = await proxy.SdbHelper.GetTypeIdFromObject(sessionId, int.Parse(objectId.Value), true, token);
int methodId = await proxy.SdbHelper.GetMethodIdByName(sessionId, typeIds[0], methodName, token);
var className = await proxy.SdbHelper.GetTypeNameOriginal(sessionId, typeIds[0], token);
if (methodId == 0) //try to search on System.Linq.Enumerable
{
var linqTypeId = await proxy.SdbHelper.GetTypeByName(sessionId, "System.Linq.Enumerable", token);
Copy link
Member

@radical radical Aug 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a static class, so can we cache it?

var linqInitialize = await proxy.SdbHelper.TypeInitialize(sessionId, linqTypeId, token);
Console.WriteLine($"linqInitialize - {linqInitialize}");
Copy link
Member

@radical radical Aug 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can be dropped

methodId = await proxy.SdbHelper.GetMethodIdByName(sessionId, linqTypeId, methodName, token);
if (methodId != 0)
{
foreach (var typeId in typeIds)
{
var genericTypes = await proxy.SdbHelper.GetGenericTypesFromType(sessionId, typeId, token);
Copy link
Member

@radical radical Aug 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And rename to genericTypeArgs?

if (genericTypes.Count > 0)
{
isTryingLinq = 1;
methodId = await proxy.SdbHelper.MakeGenericMethod(sessionId, methodId, genericTypes, token);
break;
}
}
}
}
if (methodId == 0) {
var typeName = await proxy.SdbHelper.GetTypeName(sessionId, typeId[0], token);
var typeName = await proxy.SdbHelper.GetTypeName(sessionId, typeIds[0], token);
throw new Exception($"Method '{methodName}' not found in type '{typeName}'");
}
var commandParamsObj = new MemoryStream();
var commandParamsObjWriter = new MonoBinaryWriter(commandParamsObj);
commandParamsObjWriter.WriteObj(objectId, proxy.SdbHelper);
if (isTryingLinq == 0)
Copy link
Member

@radical radical Aug 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this writing?

commandParamsObjWriter.WriteObj(objectId, proxy.SdbHelper);
if (method.ArgumentList != null)
{
commandParamsObjWriter.Write((int)method.ArgumentList.Arguments.Count);
commandParamsObjWriter.Write((int)method.ArgumentList.Arguments.Count + isTryingLinq);
if (isTryingLinq == 1)
commandParamsObjWriter.WriteObj(objectId, proxy.SdbHelper);
foreach (var arg in method.ArgumentList.Arguments)
{
if (arg.Expression is LiteralExpressionSyntax)
Expand Down
Loading