Move qmltaskmanager from qmlproject plugin to qmljseditor

src/plugins/qmljseditor/qmljseditor.pro

@@ -25,7 +25,8 @@ HEADERS += \
     qmljsrefactoringchanges.h \
     qmljscomponentfromobjectdef.h \
     qmljsoutline.h \
-    qmloutlinemodel.h
+    qmloutlinemodel.h \
+    qmltaskmanager.h
 
 SOURCES += \
     qmljscodecompletion.cpp \
@@ -43,7 +44,8 @@ SOURCES += \
     qmljsrefactoringchanges.cpp \
     qmljscomponentfromobjectdef.cpp \
     qmljsoutline.cpp \
-    qmloutlinemodel.cpp
+    qmloutlinemodel.cpp \
+    qmltaskmanager.cpp
 
 RESOURCES += qmljseditor.qrc
 OTHER_FILES += QmlJSEditor.pluginspec QmlJSEditor.mimetypes.xml

src/plugins/qmljseditor/qmljseditorconstants.h

@@ -49,7 +49,7 @@ const char * const FOLLOW_SYMBOL_UNDER_CURSOR = "QmlJSEditor.FollowSymbolUnderCu
 const char * const QML_MIMETYPE = "application/x-qml";
 const char * const JS_MIMETYPE = "application/javascript";
 
-
+const char *const TASK_CATEGORY_QML = "Task.Category.Qml";
 
 } // namespace Constants
 } // namespace QmlJSEditor

src/plugins/qmljseditor/qmljseditorplugin.cpp

@@ -40,6 +40,7 @@
 #include "qmljspreviewrunner.h"
 #include "qmljsquickfix.h"
 #include "qmljs/qmljsicons.h"
+#include "qmltaskmanager.h"
 
 #include <qmldesigner/qmldesignerconstants.h>
 
@@ -52,6 +53,7 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <projectexplorer/taskhub.h>
 #include <extensionsystem/pluginmanager.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/storagesettings.h>
@@ -180,11 +182,22 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
 
     addAutoReleasedObject(new QmlJSOutlineWidgetFactory);
 
+    m_qmlTaskManager = new QmlTaskManager;
+    addAutoReleasedObject(m_qmlTaskManager);
+
+    connect(m_modelManager, SIGNAL(documentChangedOnDisk(QmlJS::Document::Ptr)),
+            m_qmlTaskManager, SLOT(documentChangedOnDisk(QmlJS::Document::Ptr)));
+    connect(m_modelManager, SIGNAL(aboutToRemoveFiles(QStringList)),
+            m_qmlTaskManager, SLOT(documentsRemoved(QStringList)));
+
     return true;
 }
 
 void QmlJSEditorPlugin::extensionsInitialized()
 {
+    ProjectExplorer::TaskHub *taskHub =
+        ExtensionSystem::PluginManager::instance()->getObject<ProjectExplorer::TaskHub>();
+    taskHub->addCategory(Constants::TASK_CATEGORY_QML, tr("QML"));
 }
 
 ExtensionSystem::IPlugin::ShutdownFlag QmlJSEditorPlugin::aboutToShutdown()

src/plugins/qmljseditor/qmljseditorplugin.h

@@ -65,6 +65,7 @@ class QmlJSEditorFactory;
 class QmlJSTextEditor;
 class QmlJSPreviewRunner;
 class QmlJSQuickFixCollector;
+class QmlTaskManager;
 
 class QmlJSEditorPlugin : public ExtensionSystem::IPlugin
 {
@@ -112,6 +113,7 @@ private:
 
     QTimer *m_quickFixTimer;
     QPointer<TextEditor::ITextEditable> m_currentTextEditable;
+    QmlTaskManager *m_qmlTaskManager;
 };
 
 } // namespace Internal

src/plugins/qmljseditor/qmltaskmanager.cpp

@@ -0,0 +1,90 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include "qmltaskmanager.h"
+#include "qmljseditorconstants.h"
+
+#include <extensionsystem/pluginmanager.h>
+#include <projectexplorer/taskhub.h>
+#include <qmljs/qmljsmodelmanagerinterface.h>
+
+#include <QDebug>
+
+namespace QmlJSEditor {
+namespace Internal {
+
+QmlTaskManager::QmlTaskManager(QObject *parent) :
+        QObject(parent),
+        m_taskHub(0)
+{
+    m_taskHub = ExtensionSystem::PluginManager::instance()->getObject<ProjectExplorer::TaskHub>();
+}
+
+void QmlTaskManager::documentChangedOnDisk(QmlJS::Document::Ptr doc)
+{
+    const QString fileName = doc->fileName();
+    removeTasksForFile(fileName);
+
+    foreach (const QmlJS::DiagnosticMessage &msg, doc->diagnosticMessages()) {
+        ProjectExplorer::Task::TaskType type
+                = msg.isError() ? ProjectExplorer::Task::Error
+                                : ProjectExplorer::Task::Warning;
+
+        ProjectExplorer::Task task(type, msg.message, fileName, msg.loc.startLine,
+                                   Constants::TASK_CATEGORY_QML);
+        insertTask(fileName, task);
+    }
+}
+
+void QmlTaskManager::documentsRemoved(const QStringList path)
+{
+    foreach (const QString &item, path)
+        removeTasksForFile(item);
+}
+
+void QmlTaskManager::insertTask(const QString &fileName, const ProjectExplorer::Task &task)
+{
+    QList<ProjectExplorer::Task> tasks = m_docsWithTasks.value(fileName);
+    tasks.append(task);
+    m_docsWithTasks.insert(fileName, tasks);
+    m_taskHub->addTask(task);
+}
+
+void QmlTaskManager::removeTasksForFile(const QString &fileName)
+{
+    if (m_docsWithTasks.contains(fileName)) {
+        const QList<ProjectExplorer::Task> tasks = m_docsWithTasks.value(fileName);
+        foreach (const ProjectExplorer::Task &task, tasks)
+            m_taskHub->removeTask(task);
+        m_docsWithTasks.remove(fileName);
+    }
+}
+
+} // Internal
+} // QmlProjectManager

src/plugins/qmljseditor/qmltaskmanager.h

@@ -0,0 +1,72 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#ifndef QMLTASKMANAGER_H
+#define QMLTASKMANAGER_H
+
+#include <projectexplorer/task.h>
+#include <qmljs/qmljsdocument.h>
+
+#include <QtCore/QObject>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+
+namespace ProjectExplorer {
+class TaskHub;
+} // namespace ProjectExplorer
+
+namespace QmlJSEditor {
+namespace Internal {
+
+class QmlTaskManager : public QObject
+{
+    Q_OBJECT
+public:
+    QmlTaskManager(QObject *parent = 0);
+
+    void extensionsInitialized();
+
+public slots:
+    void documentChangedOnDisk(QmlJS::Document::Ptr doc);
+    void documentsRemoved(const QStringList path);
+
+private:
+    void insertTask(const QString &fileName, const ProjectExplorer::Task &task);
+    void removeTasksForFile(const QString &fileName);
+
+private:
+    ProjectExplorer::TaskHub *m_taskHub;
+    QMap<QString, QList<ProjectExplorer::Task> > m_docsWithTasks;
+};
+
+} // Internal
+} // QmlJSEditor
+
+#endif // QMLTASKMANAGER_H