Fix QML object watch not expanding property list

Amends d065e67d7f3f6d0085e10658422f8c821c296891

Fixes: QTVSADDINBUG-1138
Change-Id: Ia283dae959f9a1a06b0a05ff3aadd3161cad83ff
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

1 files changed, 13 insertions, 10 deletions

diff --git a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Property.cs b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Property.cs
index ec8f4784..14f9dbda 100644
--- a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Property.cs
+++ b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Property.cs
@@ -66,16 +66,11 @@ namespace QtVsTools.Qml.Debug.AD7
             Parent = parent;
             JsValue = value;
 
-            Children = new SortedDictionary<string, Property>();
-            if (Parent?.JsValue is JsObject {IsArray: true} jsObject) {
-                Name = $"[{JsValue.Name}]";
-                foreach (JsValue objProp in jsObject.Properties.Where(x => x.HasData)) {
-                    Children[GetChildKey(objProp.Name)]
-                        = Create(StackFrame, ScopeNumber, objProp, this);
-                }
-            } else {
-                Name = JsValue.Name;
-            }
+            Name = Parent?.JsValue switch
+            {
+                JsObject { IsArray: true } => $"[{JsValue.Name}]",
+                _ => JsValue.Name
+            };
 
             var nameParts = new Stack<string>(new[] { Name });
             for (var p = Parent; p != null && !string.IsNullOrEmpty(p.Name); p = p.Parent) {
@@ -88,6 +83,14 @@ namespace QtVsTools.Qml.Debug.AD7
             Type = JsValue.Type.ToString();
             Value = JsValue.ToString();
 
+            Children = new();
+            if (JsValue is JsObject { Properties: not null } jsObject) {
+                foreach (JsValue objProp in jsObject.Properties.Where(x => x.HasData)) {
+                    Children[GetChildKey(objProp.Name)]
+                        = Create(StackFrame, ScopeNumber, objProp, this);
+                }
+            }
+
             return true;
         }