Divide properties into: public, private, protected.

src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs

@@ -22,7 +22,6 @@
 using System.Reflection;
 using System.Collections.Immutable;
 using System.Diagnostics;
-using Microsoft.VisualBasic;
 
 namespace Microsoft.WebAssembly.Diagnostics
 {

src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs

@@ -461,12 +461,12 @@ protected override async Task<bool> AcceptCommand(MessageId id, string method, J
                         if (!DotnetObjectId.TryParse(args?["objectId"], out DotnetObjectId objectId))
                             break;
 
-                        var ret = await RuntimeGetPropertiesInternal(id, objectId, args, token);
+                        var ret = await RuntimeGetPropertiesInternal(id, objectId, args, token, true);
                         if (ret == null) {
                             SendResponse(id, Result.Err($"Unable to RuntimeGetProperties '{objectId}'"), token);
                         }
                         else
-                            SendResponse(id, Result.OkFromObject(new { result = ret }), token);
+                            SendResponse(id, Result.OkFromObject(ret), token);
                         return true;
                     }
 
@@ -658,7 +658,7 @@ private async Task<bool> OnSetVariableValue(MessageId id, int scopeId, string va
             return true;
         }
 
-        internal async Task<JToken> RuntimeGetPropertiesInternal(SessionId id, DotnetObjectId objectId, JToken args, CancellationToken token)
+        internal async Task<JToken> RuntimeGetPropertiesInternal(SessionId id, DotnetObjectId objectId, JToken args, CancellationToken token, bool sortByAccessLevel = false)
         {
             var context = GetContext(id);
             var accessorPropertiesOnly = false;
@@ -675,33 +675,48 @@ internal async Task<JToken> RuntimeGetPropertiesInternal(SessionId id, DotnetObj
                     objectValuesOpt |= GetObjectCommandOptions.OwnProperties;
                 }
             }
-            //Console.WriteLine($"RuntimeGetProperties - {args}");
             try {
                 switch (objectId.Scheme)
                 {
                     case "scope":
                     {
-                        var res = await GetScopeProperties(id, objectId.Value, token);
-                        return res.Value?["result"];
+                        var resScope = await GetScopeProperties(id, objectId.Value, token);
+                        if (sortByAccessLevel)
+                            return resScope.Value;
+                        return resScope.Value?["result"];
                     }
                     case "valuetype":
-                        return await context.SdbAgent.GetValueTypeValues(objectId.Value, accessorPropertiesOnly, token);
+                    {
+                        var resValType = await context.SdbAgent.GetValueTypeValues(objectId.Value, accessorPropertiesOnly, token);
+                        return sortByAccessLevel ? JObject.FromObject(new { result = resValType }) : resValType;
+                    }
                     case "array":
-                        return await context.SdbAgent.GetArrayValues(objectId.Value, token);
+                    {
+                        var resArr = await context.SdbAgent.GetArrayValues(objectId.Value, token);
+                        return sortByAccessLevel ? JObject.FromObject(new { result = resArr }) : resArr;
+                    }
                     case "methodId":
                     {
-                        var objRet = await context.SdbAgent.InvokeMethodInObject(objectId.Value, objectId.SubValue, "", token);
-                        return new JArray(objRet);
+                        var resMethod = await context.SdbAgent.InvokeMethodInObject(objectId.Value, objectId.SubValue, "", token);
+                        return sortByAccessLevel ? JObject.FromObject(new { result = resMethod }) : new JArray(resMethod);
                     }
                     case "object":
-                        return await context.SdbAgent.GetObjectValues(objectId.Value, objectValuesOpt, token);
+                    {
+                        var resObj = (await context.SdbAgent.GetObjectValues(objectId.Value, objectValuesOpt, token, sortByAccessLevel));
+                        return sortByAccessLevel ? resObj[0] : resObj;
+                    }
                     case "pointer":
-                        return new JArray{await context.SdbAgent.GetPointerContent(objectId.Value, token)};
+                    {
+                        var resPointer = new JArray { await context.SdbAgent.GetPointerContent(objectId.Value, token) };
+                        return sortByAccessLevel ? JObject.FromObject(new { result = resPointer }) : resPointer;
+                    }
                     case "cfo_res":
                     {
                         Result res = await SendMonoCommand(id, MonoCommands.GetDetails(RuntimeId, objectId.Value, args), token);
                         string value_json_str = res.Value["result"]?["value"]?["__value_as_json_string__"]?.Value<string>();
-                        return value_json_str != null ? JArray.Parse(value_json_str) : null;
+                        return value_json_str != null ?
+                                (sortByAccessLevel ? JObject.FromObject(new { result = JArray.Parse(value_json_str) }) : JArray.Parse(value_json_str)) :
+                                null;
                     }
                     default:
                         return null;

src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs

@@ -646,13 +646,15 @@ internal class FieldTypeClass
         public int Id { get; }
         public string Name { get; }
         public int TypeId { get; }
-        public bool IsPublic { get; }
-        public FieldTypeClass(int id, string name, int typeId, bool isPublic)
+        public bool IsNotPrivate { get; }
+        public FieldAttributes ProtectionLevel { get; }
+        public FieldTypeClass(int id, string name, int typeId, bool isNotPrivate, FieldAttributes protectionLevel)
         {
             Id = id;
             Name = name;
             TypeId = typeId;
-            IsPublic = isPublic;
+            IsNotPrivate = isNotPrivate;
+            ProtectionLevel = protectionLevel;
         }
     }
     internal class ValueTypeClass
@@ -1235,14 +1237,14 @@ public async Task<List<FieldTypeClass>> GetTypeFields(int typeId, CancellationTo
 
             for (int i = 0 ; i < nFields; i++)
             {
-                bool isPublic = false;
+                bool isNotPrivate = false;
                 int fieldId = retDebuggerCmdReader.ReadInt32(); //fieldId
                 string fieldNameStr = retDebuggerCmdReader.ReadString();
                 int fieldTypeId = retDebuggerCmdReader.ReadInt32(); //typeId
                 int attrs = retDebuggerCmdReader.ReadInt32(); //attrs
                 int isSpecialStatic = retDebuggerCmdReader.ReadInt32(); //is_special_static
                 if (((attrs & (int)MethodAttributes.Public) != 0))
-                    isPublic = true;
+                    isNotPrivate = true;
                 if (isSpecialStatic == 1)
                     continue;
                 if (fieldNameStr.Contains("k__BackingField"))
@@ -1251,7 +1253,7 @@ public async Task<List<FieldTypeClass>> GetTypeFields(int typeId, CancellationTo
                     fieldNameStr = fieldNameStr.Replace("<", "");
                     fieldNameStr = fieldNameStr.Replace(">", "");
                 }
-                ret.Add(new FieldTypeClass(fieldId, fieldNameStr, fieldTypeId, isPublic));
+                ret.Add(new FieldTypeClass(fieldId, fieldNameStr, fieldTypeId, isNotPrivate, (FieldAttributes)((attrs) & (int)FieldAttributes.FieldAccessMask)));
             }
             typeInfo.FieldsList = ret;
             return ret;
@@ -2315,41 +2317,46 @@ public async Task<JArray> GetValuesFromDebuggerProxyAttribute(int objectId, int
             return null;
         }
 
-        public async Task<JArray> GetObjectValues(int objectId, GetObjectCommandOptions getCommandType, CancellationToken token)
+        public async Task<JArray> GetObjectValues(int objectId, GetObjectCommandOptions getCommandType, CancellationToken token, bool sortByAccessLevel = false)
         {
             var typeIdsIncludingParents = await GetTypeIdFromObject(objectId, true, token);
             if (!getCommandType.HasFlag(GetObjectCommandOptions.ForDebuggerDisplayAttribute))
             {
                 var debuggerProxy = await GetValuesFromDebuggerProxyAttribute(objectId, typeIdsIncludingParents[0], token);
                 if (debuggerProxy != null)
-                    return debuggerProxy;
+                    return sortByAccessLevel ?
+                        new JArray(JObject.FromObject( new { result = debuggerProxy, internalProperties = new JArray(), privateProperties = new JArray() } )) :
+                        debuggerProxy;
             }
             if (await IsDelegate(objectId, token))
             {
                 var description = await GetDelegateMethodDescription(objectId, token);
-                return new JArray(
-                    JObject.FromObject(new
+                var objValues = new JArray(JObject.FromObject(new
+                {
+                    value = new
                     {
-                        value = new
-                        {
-                            type = "symbol",
-                            value = description,
-                            description
-                        },
-                        name = "Target"
-                    }));
+                        type = "symbol",
+                        value = description,
+                        description
+                    },
+                    name = "Target"
+                }));
+                return sortByAccessLevel ?
+                    new JArray(JObject.FromObject(new { result = objValues, internalProperties = new JArray(), privateProperties = new JArray() })) :
+                    objValues;
             }
-
+            var allFields = new List<FieldTypeClass>();
             var objects = new Dictionary<string, JToken>();
             for (int i = 0; i < typeIdsIncludingParents.Count; i++)
             {
                 int typeId = typeIdsIncludingParents[i];
                 // 0th id is for the object itself, and then its parents
                 bool isOwn = i == 0;
+                var fields = await GetTypeFields(typeId, token);
+                allFields.AddRange(fields);
 
                 if (!getCommandType.HasFlag(GetObjectCommandOptions.AccessorPropertiesOnly))
                 {
-                    var fields = await GetTypeFields(typeId, token);
                     var (collapsedFields, rootHiddenFields) = await FilterFieldsByDebuggerBrowsable(fields, typeId, token);
 
                     var collapsedFieldsValues = await GetFieldsValues(collapsedFields, isOwn);
@@ -2358,8 +2365,12 @@ public async Task<JArray> GetObjectValues(int objectId, GetObjectCommandOptions
                     objects.TryAddRange(collapsedFieldsValues);
                     objects.TryAddRange(hiddenFieldsValues);
                 }
+
                 if (!getCommandType.HasFlag(GetObjectCommandOptions.WithProperties))
-                    return new JArray(objects.Values);
+                    return sortByAccessLevel ?
+                        SegregatePropertiesByAccessLevel(allFields, objects, token) :
+                        new JArray(objects.Values);
+
                 using var commandParamsObjWriter = new MonoBinaryWriter();
                 commandParamsObjWriter.WriteObj(new DotnetObjectId("object", objectId), this);
                 var props = await CreateJArrayForProperties(
@@ -2370,41 +2381,60 @@ public async Task<JArray> GetObjectValues(int objectId, GetObjectCommandOptions
                     $"dotnet:object:{objectId}",
                     i == 0,
                     token);
-                var properties = await GetProperties(props, typeId, token);
+                var properties = await GetProperties(props, allFields, typeId, token);
                 objects.TryAddRange(properties);
 
                 // ownProperties
                 // Note: ownProperties should mean that we return members of the klass itself,
                 // but we are going to ignore that here, because otherwise vscode/chrome don't
                 // seem to ask for inherited fields at all.
                 //if (ownProperties)
-                //break;
+                    //break;
                 /*if (accessorPropertiesOnly)
                     break;*/
             }
-            if (getCommandType.HasFlag(GetObjectCommandOptions.AccessorPropertiesOnly))
-            {
-                var ownId = typeIdsIncludingParents[0];
-                var ownFields = await GetTypeFields(ownId, token);
-
-                var parentFields = new List<FieldTypeClass>();
-                for (int i = 1; i < typeIdsIncludingParents.Count; i++)
-                    parentFields.AddRange(await GetTypeFields(typeIdsIncludingParents[i], token));
-
-                var ownDuplicatedFields = ownFields.Where(field => objects.Any(obj =>
-                        field.Name.Equals(obj.Key)));
+            return sortByAccessLevel ?
+                SegregatePropertiesByAccessLevel(allFields, objects, token) :
+                new JArray(objects.Values);
 
-                var parentDuplicatedFields = parentFields.Where(field => objects.Any(obj =>
-                        field.Name.Equals(obj.Key) &&
-                        (obj.Value["isOwn"] == null ||
-                        !obj.Value["isOwn"].Value<bool>())));
-
-                foreach (var duplicate in ownDuplicatedFields)
-                    objects.Remove(duplicate.Name);
-                foreach (var duplicate in parentDuplicatedFields)
-                    objects.Remove(duplicate.Name);
+            JArray SegregatePropertiesByAccessLevel(List<FieldTypeClass> fields, Dictionary<string, JToken> objectsDict, CancellationToken token)
+            {
+                if (fields.Count == 0)
+                    return new JArray(JObject.FromObject(new { result = new JArray(objectsDict.Values) }));
+
+                var pubNames = fields.Where(field => field.ProtectionLevel == FieldAttributes.Public)
+                    .Select(field => field.Name).ToList();
+                var privNames = fields.Where(field =>
+                    (field.ProtectionLevel == FieldAttributes.Private ||
+                    field.ProtectionLevel == FieldAttributes.FamANDAssem) &&
+                    // when field is inherited it is listed both in Private and Public, to avoid duplicates:
+                    pubNames.All(pubFieldName => pubFieldName != field.Name))
+                    .Select(field => field.Name).ToList();
+                //protected == family, internal == assembly
+                var protectedAndInternalNames = fields.Where(field =>
+                    field.ProtectionLevel == FieldAttributes.Family ||
+                    field.ProtectionLevel == FieldAttributes.Assembly ||
+                    field.ProtectionLevel == FieldAttributes.FamORAssem)
+                    .Select(field => field.Name).ToList();
+                var accessorProperties = objectsDict
+                    .Where(obj => (
+                        pubNames.All(name => name != obj.Key) &&
+                        privNames.All(name => name != obj.Key) &&
+                        protectedAndInternalNames.All(name => name != obj.Key)))
+                    .Select((k, v) => k.Value);
+
+                var pubProperties = objectsDict.GetValuesByKeys(pubNames);
+                var privProperties = objectsDict.GetValuesByKeys(privNames);
+                var protAndIntProperties = objectsDict.GetValuesByKeys(protectedAndInternalNames);
+                pubProperties.AddRange(new JArray(accessorProperties));
+
+                return new JArray(JObject.FromObject(new
+                {
+                    result = pubProperties,
+                    internalProperties = protAndIntProperties,
+                    privateProperties = privProperties
+                }));
             }
-            return new JArray(objects.Values);
 
             async Task AppendRootHiddenChildren(JObject root, JArray expandedCollection)
             {
@@ -2439,7 +2469,7 @@ async Task<JArray> GetFieldsValues(List<FieldTypeClass> fields, bool isOwn, bool
                     return objFields;
 
                 if (getCommandType.HasFlag(GetObjectCommandOptions.ForDebuggerProxyAttribute))
-                    fields = fields.Where(field => field.IsPublic).ToList();
+                    fields = fields.Where(field => field.IsNotPrivate).ToList();
 
                 using var commandParamsWriter = new MonoBinaryWriter();
                 commandParamsWriter.Write(objectId);
@@ -2527,14 +2557,18 @@ async Task<JArray> GetFieldsValues(List<FieldTypeClass> fields, bool isOwn, bool
                 return (collapsedFields, rootHiddenFields);
             }
 
-            async Task<JArray> GetProperties(JArray props, int typeId, CancellationToken token)
+            async Task<JArray> GetProperties(JArray props, List<FieldTypeClass> fields, int typeId, CancellationToken token)
             {
                 var typeInfo = await GetTypeInfo(typeId, token);
                 var typeProperitesBrowsableInfo = typeInfo?.Info?.DebuggerBrowsableProperties;
                 var regularProps = new JArray();
                 foreach (var p in props)
                 {
-                    if (!typeProperitesBrowsableInfo.TryGetValue(p["name"].Value<string>(), out DebuggerBrowsableState? state))
+                    var propName = p["name"].Value<string>();
+                    // if property has a backing field - avoid adding a duplicate
+                    if (fields.Any(field => field.Name == propName))
+                        continue;
+                    if (!typeProperitesBrowsableInfo.TryGetValue(propName, out DebuggerBrowsableState? state))
                     {
                         regularProps.Add(p);
                         continue;
@@ -2546,7 +2580,7 @@ async Task<JArray> GetProperties(JArray props, int typeId, CancellationToken tok
                         case DebuggerBrowsableState.RootHidden:
                             DotnetObjectId rootObjId;
                             DotnetObjectId.TryParse(p["get"]["objectId"].Value<string>(), out rootObjId);
-                            var rootObject = await InvokeMethodInObject(rootObjId.Value, rootObjId.SubValue, p["name"].Value<string>(), token);
+                            var rootObject = await InvokeMethodInObject(rootObjId.Value, rootObjId.SubValue, propName, token);
                             await AppendRootHiddenChildren(rootObject, regularProps);
                             break;
                         case DebuggerBrowsableState.Collapsed:
@@ -2663,5 +2697,17 @@ public static void TryAddRange(this Dictionary<string, JToken> dict, JArray adde
                 dict.TryAdd(key, item);
             }
         }
+
+        public static JArray GetValuesByKeys(this Dictionary<string, JToken> dict, List<string> keys)
+        {
+            var result = new JArray();
+            foreach (var name in keys)
+            {
+                if (!dict.TryGetValue(name, out var obj))
+                    continue;
+                result.Add(obj);
+            }
+            return result;
+        }
     }
 }