forked from qt-creator/qt-creator
QmlJSEditor: Move document to its own file
Change-Id: I81c1ae5af617e801196edd612aff62ba4d864409 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
@@ -28,9 +28,10 @@
|
||||
****************************************************************************/
|
||||
|
||||
#include "qmljseditor.h"
|
||||
|
||||
#include "qmljseditoreditable.h"
|
||||
#include "qmljseditorconstants.h"
|
||||
#include "qmljshighlighter.h"
|
||||
#include "qmljseditordocument.h"
|
||||
#include "qmljseditorplugin.h"
|
||||
#include "qmloutlinemodel.h"
|
||||
#include "qmljsfindreferences.h"
|
||||
@@ -48,7 +49,6 @@
|
||||
|
||||
#include <qmljstools/qmljstoolsconstants.h>
|
||||
#include <qmljstools/qmljsindenter.h>
|
||||
#include <qmljstools/qmljsqtstylecodeformatter.h>
|
||||
|
||||
#include <coreplugin/actionmanager/actionmanager.h>
|
||||
#include <coreplugin/actionmanager/actioncontainer.h>
|
||||
@@ -760,19 +760,6 @@ void QmlJSTextEditorWidget::updateOutlineIndexNow()
|
||||
}
|
||||
}
|
||||
|
||||
QmlJSEditorDocument::QmlJSEditorDocument()
|
||||
{
|
||||
connect(this, SIGNAL(tabSettingsChanged()),
|
||||
this, SLOT(invalidateFormatterCache()));
|
||||
setSyntaxHighlighter(new Highlighter(document()));
|
||||
}
|
||||
|
||||
void QmlJSEditorDocument::invalidateFormatterCache()
|
||||
{
|
||||
QmlJSTools::CreatorCodeFormatter formatter(tabSettings());
|
||||
formatter.invalidateCache(document());
|
||||
}
|
||||
|
||||
} // namespace QmlJSEditor
|
||||
|
||||
class QtQuickToolbarMarker {};
|
||||
|
||||
@@ -74,15 +74,6 @@ class SemanticInfoUpdater;
|
||||
struct SemanticInfoUpdaterSource;
|
||||
class SemanticHighlighter;
|
||||
|
||||
class QmlJSEditorDocument : public TextEditor::BaseTextDocument
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
QmlJSEditorDocument();
|
||||
private slots:
|
||||
void invalidateFormatterCache();
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
|
||||
struct QMLJSEDITOR_EXPORT Declaration
|
||||
|
||||
@@ -35,7 +35,8 @@ HEADERS += \
|
||||
qmljsquickfix.h \
|
||||
qmljssemanticinfoupdater.h \
|
||||
qmljssemantichighlighter.h \
|
||||
qmljswrapinloader.h
|
||||
qmljswrapinloader.h \
|
||||
qmljseditordocument.h
|
||||
|
||||
SOURCES += \
|
||||
qmljseditor.cpp \
|
||||
@@ -67,7 +68,8 @@ SOURCES += \
|
||||
qmljsquickfix.cpp \
|
||||
qmljssemanticinfoupdater.cpp \
|
||||
qmljssemantichighlighter.cpp \
|
||||
qmljswrapinloader.cpp
|
||||
qmljswrapinloader.cpp \
|
||||
qmljseditordocument.cpp
|
||||
|
||||
RESOURCES += qmljseditor.qrc
|
||||
|
||||
|
||||
@@ -36,6 +36,8 @@ QtcPlugin {
|
||||
"qmljseditor.qrc",
|
||||
"qmljseditor_global.h",
|
||||
"qmljseditorconstants.h",
|
||||
"qmljseditordocument.cpp",
|
||||
"qmljseditordocument.h",
|
||||
"qmljseditoreditable.cpp",
|
||||
"qmljseditoreditable.h",
|
||||
"qmljseditorfactory.cpp",
|
||||
|
||||
50
src/plugins/qmljseditor/qmljseditordocument.cpp
Normal file
50
src/plugins/qmljseditor/qmljseditordocument.cpp
Normal file
@@ -0,0 +1,50 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of Qt Creator.
|
||||
**
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** 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.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "qmljseditordocument.h"
|
||||
|
||||
#include "qmljshighlighter.h"
|
||||
|
||||
#include <qmljstools/qmljsqtstylecodeformatter.h>
|
||||
|
||||
using namespace QmlJSEditor;
|
||||
using namespace QmlJSEditor::Internal;
|
||||
|
||||
QmlJSEditorDocument::QmlJSEditorDocument()
|
||||
{
|
||||
connect(this, SIGNAL(tabSettingsChanged()),
|
||||
this, SLOT(invalidateFormatterCache()));
|
||||
setSyntaxHighlighter(new Highlighter(document()));
|
||||
}
|
||||
|
||||
void QmlJSEditorDocument::invalidateFormatterCache()
|
||||
{
|
||||
QmlJSTools::CreatorCodeFormatter formatter(tabSettings());
|
||||
formatter.invalidateCache(document());
|
||||
}
|
||||
50
src/plugins/qmljseditor/qmljseditordocument.h
Normal file
50
src/plugins/qmljseditor/qmljseditordocument.h
Normal file
@@ -0,0 +1,50 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of Qt Creator.
|
||||
**
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** 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.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QMLJSEDITORDOCUMENT_H
|
||||
#define QMLJSEDITORDOCUMENT_H
|
||||
|
||||
#include <texteditor/basetextdocument.h>
|
||||
|
||||
namespace QmlJSEditor {
|
||||
namespace Internal {
|
||||
|
||||
class QmlJSEditorDocument : public TextEditor::BaseTextDocument
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
QmlJSEditorDocument();
|
||||
private slots:
|
||||
void invalidateFormatterCache();
|
||||
};
|
||||
|
||||
} // Internal
|
||||
} // QmlJSEditor
|
||||
|
||||
#endif // QMLJSEDITORDOCUMENT_H
|
||||
Reference in New Issue
Block a user