Object Explorer: Expand object one level

spyder-ide · Mar 17, 2019 · c93a870 · c93a870
1 parent a193c24
commit c93a870
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/spyder/plugins/variableexplorer/widgets/collectionseditor.py b/spyder/plugins/variableexplorer/widgets/collectionseditor.py
@@ -561,7 +561,8 @@ def createEditor(self, parent, option, index):
                 return editor
         # CollectionsEditor for an arbitrary Python object
         else:
-            editor = ObjectBrowser({_('Object'): value}, parent=parent)
+            editor = ObjectBrowser({_('Object'): value}, expanded=True,
+                                   parent=parent)
             self.create_dialog(editor, dict(model=index.model(),
                                             editor=editor,
                                             key=key, readonly=readonly))

diff --git a/spyder/plugins/variableexplorer/widgets/objecteditor2/objecteditor.py b/spyder/plugins/variableexplorer/widgets/objecteditor2/objecteditor.py
@@ -50,6 +50,7 @@ class ObjectBrowser(QDialog):
     def __init__(self,
                  obj,
                  name='',
+                 expanded=False,
                  parent=None,
                  attribute_columns=DEFAULT_ATTR_COLS,
                  attribute_details=DEFAULT_ATTR_DETAILS,
@@ -97,8 +98,8 @@ def __init__(self,
             refresh_rate=refresh_rate,
             show_callable_attributes=show_callable_attributes,
             show_special_attributes=show_special_attributes)
-
-        self._tree_model = TreeModel(obj, name, attr_cols=self._attr_cols)
+        self._tree_model = TreeModel(obj, obj_name=name,
+                                     attr_cols=self._attr_cols)
 
         self._proxy_tree_model = TreeProxyModel(
             show_callable_attributes=show_callable_attributes,
@@ -132,7 +133,7 @@ def __init__(self,
         # Select first row so that a hidden root node will not be selected.
         first_row_index = self._proxy_tree_model.firstItemIndex()
         self.obj_tree.setCurrentIndex(first_row_index)
-        if self._tree_model.inspectedNodeIsVisible:
+        if self._tree_model.inspectedNodeIsVisible or expanded:
             self.obj_tree.expand(first_row_index)
 
     def refresh(self):

diff --git a/spyder/plugins/variableexplorer/widgets/objecteditor2/tree_model.py b/spyder/plugins/variableexplorer/widgets/objecteditor2/tree_model.py
@@ -88,7 +88,7 @@ def __init__(self,
         self._inspected_node_is_visible = None
         self._inspected_item = None
         self._root_item = None
-        self.populateTree(obj, obj_name)
+        self.populateTree(obj, obj_name=obj_name)
 
     @property
     def inspectedNodeIsVisible(self):
@@ -334,7 +334,6 @@ def _fetchObjectChildren(self, obj, obj_path):
     def populateTree(self, obj, obj_name='', inspected_node_is_visible=None):
         """Fills the tree using a python object. Sets the rootItem."""
         logger.debug("populateTree with object id = 0x{:x}".format(id(obj)))
-
         if inspected_node_is_visible is None:
             inspected_node_is_visible = (obj_name != '')
         self._inspected_node_is_visible = inspected_node_is_visible