ProjectTree: Add per-node "Expand" and "Collapse" actions

Change-Id: Ic722598f7bb2665ac7a09c24b7eefa9dc6787808
Reviewed-by: hjk <hjk@qt.io>

src/plugins/projectexplorer/projectexplorer.cpp

@@ -511,6 +511,8 @@ public:
     QAction *m_openFileAction;
     QAction *m_projectTreeCollapseAllAction;
     QAction *m_projectTreeExpandAllAction;
+    QAction *m_projectTreeCollapseNodeAction = nullptr;
+    QAction *m_projectTreeExpandNodeAction = nullptr;
     Utils::ParameterAction *m_closeProjectFilesActionFileMenu;
     Utils::ParameterAction *m_closeProjectFilesActionContextMenu;
     QAction *m_searchOnFileSystem;
@@ -1350,6 +1352,26 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     // Collapse & Expand.
     const Id treeGroup = Constants::G_PROJECT_TREE;
+
+    dd->m_projectTreeCollapseNodeAction = new QAction(tr("Collapse"), this);
+    connect(dd->m_projectTreeCollapseNodeAction, &QAction::triggered,
+            ProjectTree::instance(), &ProjectTree::collapseCurrentNode);
+    Command * const collapseNodeCmd = ActionManager::registerAction(
+                dd->m_projectTreeCollapseNodeAction, "ProjectExplorer.CollapseNode",
+                projectTreeContext);
+    dd->m_projectTreeExpandNodeAction = new QAction(tr("Expand"), this);
+    connect(dd->m_projectTreeExpandNodeAction, &QAction::triggered,
+            ProjectTree::instance(), &ProjectTree::expandCurrentNode);
+    Command * const expandNodeCmd = ActionManager::registerAction(
+                dd->m_projectTreeExpandNodeAction, "ProjectExplorer.ExpandNode",
+                projectTreeContext);
+    for (Core::ActionContainer * const ac : {msubProjectContextMenu, mfolderContextMenu,
+                                             mprojectContextMenu}) {
+        ac->addSeparator(treeGroup);
+        ac->addAction(collapseNodeCmd, treeGroup);
+        ac->addAction(expandNodeCmd, treeGroup);
+    }
+
     dd->m_projectTreeCollapseAllAction = new QAction(tr("Collapse All"), this);
     Command * const collapseCmd = ActionManager::registerAction(
                 dd->m_projectTreeCollapseAllAction, Constants::PROJECTTREE_COLLAPSE_ALL,

src/plugins/projectexplorer/projecttree.cpp

@@ -154,7 +154,7 @@ void ProjectTree::update()
     ProjectTreeWidget *focus = m_focusForContextMenu;
     static QPointer<ProjectTreeWidget> lastFocusedProjectTreeWidget;
     if (!focus) {
-        focus = Utils::findOrDefault(m_projectTreeWidgets, &ProjectTree::hasFocus);
+        focus = currentWidget();
         lastFocusedProjectTreeWidget = focus;
     }
     if (!focus)
@@ -284,15 +284,27 @@ void ProjectTree::sessionAndTreeChanged()
     emit treeChanged();
 }
 
+void ProjectTree::collapseCurrentNode()
+{
+    if (const auto w = currentWidget())
+        w->collapseCurrentNode();
+}
+
+void ProjectTree::expandCurrentNode()
+{
+    if (const auto w = currentWidget())
+        w->expandCurrentNode();
+}
+
 void ProjectTree::collapseAll()
 {
-    if (auto w = Utils::findOrDefault(s_instance->m_projectTreeWidgets, &ProjectTree::hasFocus))
+    if (const auto w = currentWidget())
         w->collapseAll();
 }
 
 void ProjectTree::expandAll()
 {
-    if (auto w = Utils::findOrDefault(s_instance->m_projectTreeWidgets, &ProjectTree::hasFocus))
+    if (const auto w = currentWidget())
         w->expandAll();
 }
 
@@ -344,6 +356,11 @@ bool ProjectTree::hasFocus(ProjectTreeWidget *widget)
                 || s_instance->m_focusForContextMenu == widget);
 }
 
+ProjectTreeWidget *ProjectTree::currentWidget() const
+{
+    return findOrDefault(m_projectTreeWidgets, &ProjectTree::hasFocus);
+}
+
 void ProjectTree::showContextMenu(ProjectTreeWidget *focus, const QPoint &globalPos, Node *node)
 {
     QMenu *contextMenu = nullptr;

src/plugins/projectexplorer/projecttree.h

@@ -82,6 +82,9 @@ public:
     static Project *projectForNode(const Node *node);
     static Node *nodeForFile(const Utils::FilePath &fileName);
 
+    void collapseCurrentNode();
+    void expandCurrentNode();
+
     void collapseAll();
     void expandAll();
 
@@ -117,6 +120,7 @@ private:
 
     void updateExternalFileWarning();
     static bool hasFocus(Internal::ProjectTreeWidget *widget);
+    Internal::ProjectTreeWidget *currentWidget() const;
     void hideContextMenu();
 
 private:

src/plugins/projectexplorer/projecttreewidget.cpp

@@ -430,6 +430,16 @@ void ProjectTreeWidget::setAutoSynchronization(bool sync)
         syncFromDocumentManager();
 }
 
+void ProjectTreeWidget::collapseCurrentNode()
+{
+    m_view->collapse(m_view->currentIndex());
+}
+
+void ProjectTreeWidget::expandCurrentNode()
+{
+    m_view->expand(m_view->currentIndex());
+}
+
 void ProjectTreeWidget::collapseAll()
 {
     m_view->collapseAll();

src/plugins/projectexplorer/projecttreewidget.h

@@ -67,6 +67,8 @@ public:
 
     void toggleAutoSynchronization();
     void editCurrentItem();
+    void collapseCurrentNode();
+    void expandCurrentNode();
     void collapseAll();
     void expandAll();