purge files which cannot be opened from the "open" editors model

Task-number: QTCREATORBUG-2424

diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index d53b3b5..5d9cb25 100644 (file)
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -939,7 +939,8 @@ void EditorManager::activateEditorForIndex(Internal::EditorView *view, const QMo
 
     QString fileName = index.data(Qt::UserRole + 1).toString();
     QString id = index.data(Qt::UserRole + 2).toString();
-    openEditor(view, fileName, id, flags);
+    if (!openEditor(view, fileName, id, flags))
+        m_d->m_editorModel->removeEditor(index);
 }
 
 Core::IEditor *EditorManager::placeEditor(Core::Internal::EditorView *view, Core::IEditor *editor)

diff --git a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
index d205e3d..84f88a4 100644 (file)
--- a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
@@ -204,6 +204,11 @@ void OpenEditorsModel::removeEditor(const QModelIndex &index)
     removeEditor(index.row());
 }
 
+void OpenEditorsModel::removeEditor(const QString &fileName)
+{
+    removeEditor(findFileName(fileName));
+}
+
 void OpenEditorsModel::removeEditor(int idx)
 {
     if (idx < 0)

diff --git a/src/plugins/coreplugin/editormanager/openeditorsmodel.h b/src/plugins/coreplugin/editormanager/openeditorsmodel.h
index ab9b14b..39ee81f 100644 (file)
--- a/src/plugins/coreplugin/editormanager/openeditorsmodel.h
+++ b/src/plugins/coreplugin/editormanager/openeditorsmodel.h
@@ -82,6 +82,7 @@ public:
 
     void removeEditor(IEditor *editor);
     void removeEditor(const QModelIndex &index);
+    void removeEditor(const QString &fileName);
 
     void removeAllRestoredEditors();
     void emitDataChanged(IEditor *editor);

diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
index 98a6d31..8a24d72 100644 (file)
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
@@ -282,8 +282,12 @@ void OpenEditorsWindow::selectEditor(QTreeWidgetItem *item)
         EditorView *view = item->data(0, Qt::UserRole+1).value<EditorView*>();
         EditorManager::instance()->activateEditorForFile(view, file, Core::EditorManager::ModeSwitch);
     } else {
-        EditorManager::instance()->openEditor(item->toolTip(0), item->data(0, Qt::UserRole+2).toByteArray(),
-                                              Core::EditorManager::ModeSwitch);
+        if (!EditorManager::instance()->openEditor(
+                    item->toolTip(0), item->data(0, Qt::UserRole+2).toByteArray(),
+                    Core::EditorManager::ModeSwitch)) {
+            EditorManager::instance()->openedEditorsModel()->removeEditor(item->toolTip(0));
+            delete item;
+        }
     }
 }