Handle "Diff All Modified Files" action enablement

Also rename it to "Diff Open Files".

Task-number: QTCREATORBUG-17094
Change-Id: I370c32497fcb56cb2bd84700ef7cb4aa7ba0a573
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

src/plugins/coreplugin/editormanager/editormanager.cpp

@@ -1906,9 +1906,9 @@ void EditorManagerPrivate::handleDocumentStateChange()
     IDocument *document = qobject_cast<IDocument *>(sender());
     if (!document->isModified())
         document->removeAutoSaveFile();
-    if (EditorManager::currentDocument() == document) {
+    if (EditorManager::currentDocument() == document)
         emit m_instance->currentDocumentStateChanged();
-    }
+    emit m_instance->documentStateChanged(document);
 }
 
 void EditorManagerPrivate::editorAreaDestroyed(QObject *area)

src/plugins/coreplugin/editormanager/editormanager.h

@@ -179,6 +179,7 @@ public: // for tests
 signals:
     void currentEditorChanged(Core::IEditor *editor);
     void currentDocumentStateChanged();
+    void documentStateChanged(Core::IDocument *document);
     void editorCreated(Core::IEditor *editor, const QString &fileName);
     void editorOpened(Core::IEditor *editor);
     void editorAboutToClose(Core::IEditor *editor);

src/plugins/diffeditor/diffeditorplugin.cpp

@@ -44,8 +44,10 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
 
+#include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
 
+#include <utils/algorithm.h>
 #include <utils/qtcassert.h>
 
 namespace DiffEditor {
@@ -68,7 +70,7 @@ DiffFilesController::DiffFilesController(Core::IDocument *document)
 FileData DiffFilesController::diffFiles(const QString &leftContents, const QString &rightContents)
 {
     Differ differ;
-    QList<Diff> diffList = differ.cleanupSemantics(differ.diff(leftContents, rightContents));
+    const QList<Diff> diffList = differ.cleanupSemantics(differ.diff(leftContents, rightContents));
 
     QList<Diff> leftDiffList;
     QList<Diff> rightDiffList;
@@ -90,7 +92,7 @@ FileData DiffFilesController::diffFiles(const QString &leftContents, const QStri
 
     const ChunkData chunkData = DiffUtils::calculateOriginalData(
                 outputLeftDiffList, outputRightDiffList);
-    FileData fileData = DiffUtils::calculateContextData(chunkData, contextLineCount(), 0);
+    const FileData fileData = DiffUtils::calculateContextData(chunkData, contextLineCount(), 0);
 
     return fileData;
 }
@@ -152,23 +154,23 @@ void DiffCurrentFileController::reload()
 
 /////////////////
 
-class DiffAllModifiedFilesController : public DiffFilesController
+class DiffOpenFilesController : public DiffFilesController
 {
     Q_OBJECT
 public:
-    DiffAllModifiedFilesController(Core::IDocument *document);
+    DiffOpenFilesController(Core::IDocument *document);
 
 protected:
     void reload();
 };
 
-DiffAllModifiedFilesController::DiffAllModifiedFilesController(Core::IDocument *document) :
+DiffOpenFilesController::DiffOpenFilesController(Core::IDocument *document) :
     DiffFilesController(document)
 { }
 
-void DiffAllModifiedFilesController::reload()
+void DiffOpenFilesController::reload()
 {
-    QList<Core::IDocument *> openedDocuments =
+    const QList<Core::IDocument *> openedDocuments =
             Core::DocumentModel::openedDocuments();
 
     QList<FileData> fileDataList;
@@ -333,6 +335,13 @@ void DiffExternalFilesController::reload()
 
 /////////////////
 
+
+static TextEditor::TextDocument *currentTextDocument()
+{
+    return qobject_cast<TextEditor::TextDocument *>(
+                Core::EditorManager::currentDocument());
+}
+
 DiffEditorServiceImpl::DiffEditorServiceImpl(QObject *parent) :
     QObject(parent)
 {
@@ -372,11 +381,11 @@ bool DiffEditorPlugin::initialize(const QStringList &arguments, QString *errorMe
     connect(m_diffCurrentFileAction, &QAction::triggered, this, &DiffEditorPlugin::diffCurrentFile);
     diffContainer->addAction(diffCurrentFileCommand);
 
-    QAction *diffAllModifiedFilesAction = new QAction(tr("Diff All Modified Files"), this);
+    m_diffOpenFilesAction = new QAction(tr("Diff Open Files"), this);
-    Core::Command *diffAllModifiedFilesCommand = Core::ActionManager::registerAction(diffAllModifiedFilesAction, "DiffEditor.DiffAllModifiedFiles");
+    Core::Command *diffOpenFilesCommand = Core::ActionManager::registerAction(m_diffOpenFilesAction, "DiffEditor.DiffOpenFiles");
-    diffAllModifiedFilesCommand->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+Shift+H") : tr("Ctrl+Shift+H")));
+    diffOpenFilesCommand->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+Shift+H") : tr("Ctrl+Shift+H")));
-    connect(diffAllModifiedFilesAction, &QAction::triggered, this, &DiffEditorPlugin::diffAllModifiedFiles);
+    connect(m_diffOpenFilesAction, &QAction::triggered, this, &DiffEditorPlugin::diffOpenFiles);
-    diffContainer->addAction(diffAllModifiedFilesCommand);
+    diffContainer->addAction(diffOpenFilesCommand);
 
     QAction *diffExternalFilesAction = new QAction(tr("Diff External Files..."), this);
     Core::Command *diffExternalFilesCommand = Core::ActionManager::registerAction(diffExternalFilesAction, "DiffEditor.DiffExternalFiles");
@@ -384,9 +393,18 @@ bool DiffEditorPlugin::initialize(const QStringList &arguments, QString *errorMe
     diffContainer->addAction(diffExternalFilesCommand);
 
     connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged,
-        this, &DiffEditorPlugin::updateCurrentEditor);
+        this, &DiffEditorPlugin::updateDiffCurrentFileAction);
+    connect(Core::EditorManager::instance(), &Core::EditorManager::currentDocumentStateChanged,
+        this, &DiffEditorPlugin::updateDiffCurrentFileAction);
+    connect(Core::EditorManager::instance(), &Core::EditorManager::editorOpened,
+        this, &DiffEditorPlugin::updateDiffOpenFilesAction);
+    connect(Core::EditorManager::instance(), &Core::EditorManager::editorsClosed,
+        this, &DiffEditorPlugin::updateDiffOpenFilesAction);
+    connect(Core::EditorManager::instance(), &Core::EditorManager::documentStateChanged,
+        this, &DiffEditorPlugin::updateDiffOpenFilesAction);
 
-    updateActions();
+    updateDiffCurrentFileAction();
+    updateDiffOpenFilesAction();
 
     addAutoReleasedObject(new DiffEditorFactory(this));
     addAutoReleasedObject(new DiffEditorServiceImpl(this));
@@ -397,36 +415,28 @@ bool DiffEditorPlugin::initialize(const QStringList &arguments, QString *errorMe
 void DiffEditorPlugin::extensionsInitialized()
 { }
 
-void DiffEditorPlugin::updateCurrentEditor(Core::IEditor *editor)
+void DiffEditorPlugin::updateDiffCurrentFileAction()
 {
-    if (m_currentTextDocument)
+    auto textDocument = currentTextDocument();
-        m_currentTextDocument->disconnect(this);
+    const bool enabled = textDocument && textDocument->isModified();
-    m_currentTextDocument = 0;
+    m_diffCurrentFileAction->setEnabled(enabled);
-
-    if (editor) {
-        TextEditor::TextEditorWidget *editorWidget = qobject_cast<TextEditor::TextEditorWidget *>(editor->widget());
-        if (editorWidget) {
-            m_currentTextDocument = editorWidget->textDocument();
-            connect(m_currentTextDocument.data(), &Core::IDocument::changed,
-                    this, &DiffEditorPlugin::updateActions);
-        }
-    }
-
-    updateActions();
 }
 
-void DiffEditorPlugin::updateActions()
+void DiffEditorPlugin::updateDiffOpenFilesAction()
 {
-    const bool diffCurrentFileEnabled = m_currentTextDocument && m_currentTextDocument->isModified();
+    const bool enabled = Utils::anyOf(Core::DocumentModel::openedDocuments(), [](Core::IDocument *doc) {
-    m_diffCurrentFileAction->setEnabled(diffCurrentFileEnabled);
+            return doc->isModified() && qobject_cast<TextEditor::TextDocument *>(doc);
+        });
+    m_diffOpenFilesAction->setEnabled(enabled);
 }
 
 void DiffEditorPlugin::diffCurrentFile()
 {
-    if (!m_currentTextDocument)
+    auto textDocument = currentTextDocument();
+    if (!textDocument)
         return;
 
-    const QString fileName = m_currentTextDocument->filePath().toString();
+    const QString fileName = textDocument->filePath().toString();
 
     if (fileName.isEmpty())
         return;
@@ -444,17 +454,17 @@ void DiffEditorPlugin::diffCurrentFile()
     document->reload();
 }
 
-void DiffEditorPlugin::diffAllModifiedFiles()
+void DiffEditorPlugin::diffOpenFiles()
 {
-    const QString documentId = QLatin1String("Diff All Modified Files");
+    const QString documentId = QLatin1String("Diff Open Files");
-    const QString title = tr("Diff All Modified Files");
+    const QString title = tr("Diff Open Files");
     auto const document = qobject_cast<DiffEditorDocument *>(
                 DiffEditorController::findOrCreateDocument(documentId, title));
     if (!document)
         return;
 
     if (!DiffEditorController::controller(document))
-        new DiffAllModifiedFilesController(document);
+        new DiffOpenFilesController(document);
     Core::EditorManager::activateEditorForDocument(document);
     document->reload();
 }

src/plugins/diffeditor/diffeditorplugin.h

@@ -28,7 +28,6 @@
 #include "diffeditor_global.h"
 
 #include <coreplugin/diffservice.h>
-#include <texteditor/textdocument.h>
 #include <extensionsystem/iplugin.h>
 
 QT_FORWARD_DECLARE_CLASS(QAction)
@@ -58,10 +57,10 @@ public:
     void extensionsInitialized();
 
 private slots:
-    void updateCurrentEditor(Core::IEditor *editor);
+    void updateDiffCurrentFileAction();
-    void updateActions();
+    void updateDiffOpenFilesAction();
     void diffCurrentFile();
-    void diffAllModifiedFiles();
+    void diffOpenFiles();
     void diffExternalFiles();
 
 #ifdef WITH_TESTS
@@ -72,7 +71,7 @@ private slots:
 #endif // WITH_TESTS
 private:
     QAction *m_diffCurrentFileAction;
-    QPointer<TextEditor::TextDocument> m_currentTextDocument;
+    QAction *m_diffOpenFilesAction;
 };
 
 } // namespace Internal