Display fields transitively in Merged Fields

Author: jisedlac

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaFieldsPlugin.java

@@ -619,8 +619,9 @@ protected boolean sorts(DataType dataType) {
                 }
                 protected HeapViewerNode createNode(Instance object) {
                     return new InstanceNode(object) {
-                        public boolean isLeaf() {
-                            return true;
+                        protected HeapViewerNode[] lazilyComputeChildren(Heap heap, String viewID, HeapViewerNodeFilter viewFilter, List<DataType> dataTypes, List<SortOrder> sortOrders, Progress progress) throws InterruptedException {
+                            List<FieldValue> fields = JavaFieldsProvider.InstanceFieldsProvider.getFields(this, heap, true, true);
+                            return JavaFieldsProvider.getNodes(fields, this, heap, viewID, viewFilter, dataTypes, sortOrders, progress);
                         }
                     };
                 }

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaFieldsProvider.java

@@ -44,7 +44,6 @@
 import org.graalvm.visualvm.heapviewer.model.Progress;
 import org.graalvm.visualvm.heapviewer.ui.UIThresholds;
 import org.graalvm.visualvm.heapviewer.utils.NodesComputer;
-import static org.graalvm.visualvm.heapviewer.utils.NodesComputer.integerIterator;
 import org.graalvm.visualvm.heapviewer.utils.ProgressIterator;
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
@@ -129,14 +128,18 @@ public boolean supportsNode(HeapViewerNode parent, Heap heap, String viewID) {
 
 
         protected List<FieldValue> getFields(HeapViewerNode parent, Heap heap) {
+            return getFields(parent, heap, includeInstanceFields, includeStaticFields);
+        }
+        
+        static List<FieldValue> getFields(HeapViewerNode parent, Heap heap, boolean instanceFields, boolean staticFields) {
             Instance instance = HeapViewerNode.getValue(parent, DataType.INSTANCE, heap);
             if (instance == null) return null;
 
-            if (includeStaticFields == includeInstanceFields) {
+            if (staticFields == instanceFields) {
                 List<FieldValue> fields = new ArrayList(instance.getFieldValues());
                 fields.addAll(instance.getStaticFieldValues());
                 return fields;
-            } else if (includeInstanceFields) {
+            } else if (instanceFields) {
                 return instance.getFieldValues();
             } else {
                 return instance.getStaticFieldValues();