forked from qt-creator/qt-creator
Conflicts: src/plugins/coreplugin/basemode.cpp src/plugins/coreplugin/basemode.h src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp src/plugins/debugger/debuggeragents.cpp src/plugins/debugger/debuggeruiswitcher.cpp src/plugins/debugger/debuggeruiswitcher.h src/plugins/projectexplorer/buildconfigdialog.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.h src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h src/plugins/qmldesigner/designercore/include/modelutilities.h src/plugins/qmldesigner/designercore/include/nodeinstance.h src/plugins/qmldesigner/designercore/include/propertymetainfo.h src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp src/plugins/qmldesigner/designercore/model/modelutilities.cpp src/plugins/snippets/inputwidget.cpp src/plugins/snippets/snippetscompletion.cpp src/plugins/snippets/snippetscompletion.h src/plugins/snippets/snippetspec.cpp src/plugins/snippets/snippetsplugin.cpp src/plugins/snippets/snippetswindow.cpp src/plugins/snippets/snippetswindow.h src/plugins/texteditor/snippetsparser.cpp src/tools/qml/qmldom/main.cpp tests/manual/trk/runner.cpp tests/manual/trk/trkolddevice.cpp tests/manual/trk/trkolddevice.h tests/manual/trk/trkserver.cpp
128 lines
4.7 KiB
C++
128 lines
4.7 KiB
C++
/**************************************************************************
|
|
**
|
|
** This file is part of Qt Creator
|
|
**
|
|
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
|
|
**
|
|
** Contact: Nokia Corporation (qt-info@nokia.com)
|
|
**
|
|
** No Commercial Usage
|
|
**
|
|
** This file contains pre-release code and may not be distributed.
|
|
** You may use this file in accordance with the terms and conditions
|
|
** contained in the Technology Preview License Agreement accompanying
|
|
** this package.
|
|
**
|
|
** 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, Nokia gives you certain additional
|
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** If you have questions regarding the use of this file, please contact
|
|
** Nokia at qt-info@nokia.com.
|
|
**
|
|
**************************************************************************/
|
|
|
|
#include "qmljsquickfix.h"
|
|
#include "qmljscomponentfromobjectdef.h"
|
|
#include "qmljseditor.h"
|
|
|
|
#include <extensionsystem/iplugin.h>
|
|
#include <extensionsystem/pluginmanager.h>
|
|
#include <qmljs/parser/qmljsast_p.h>
|
|
#include <qmljstools/qmljsrefactoringchanges.h>
|
|
|
|
#include <QtGui/QApplication>
|
|
|
|
using namespace QmlJS;
|
|
using namespace QmlJS::AST;
|
|
using namespace QmlJSEditor;
|
|
using namespace QmlJSEditor::Internal;
|
|
using namespace QmlJSTools;
|
|
using namespace TextEditor;
|
|
using TextEditor::RefactoringChanges;
|
|
|
|
namespace {
|
|
|
|
class SplitInitializerOp: public QmlJSQuickFixFactory
|
|
{
|
|
public:
|
|
virtual QList<QmlJSQuickFixOperation::Ptr> match(const QmlJSQuickFixState &state)
|
|
{
|
|
UiObjectInitializer *objectInitializer = 0;
|
|
|
|
const int pos = state.currentFile().cursor().position();
|
|
|
|
if (QmlJS::AST::Node *member = state.semanticInfo().declaringMember(pos)) {
|
|
if (QmlJS::AST::UiObjectBinding *b = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding *>(member)) {
|
|
if (b->initializer->lbraceToken.startLine == b->initializer->rbraceToken.startLine)
|
|
objectInitializer = b->initializer;
|
|
|
|
} else if (QmlJS::AST::UiObjectDefinition *b = QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition *>(member)) {
|
|
if (b->initializer->lbraceToken.startLine == b->initializer->rbraceToken.startLine)
|
|
objectInitializer = b->initializer;
|
|
}
|
|
}
|
|
|
|
if (objectInitializer)
|
|
return singleResult(new Operation(state, objectInitializer));
|
|
else
|
|
return noResult();
|
|
}
|
|
|
|
private:
|
|
class Operation: public QmlJSQuickFixOperation
|
|
{
|
|
UiObjectInitializer *_objectInitializer;
|
|
|
|
public:
|
|
Operation(const QmlJSQuickFixState &state, UiObjectInitializer *objectInitializer)
|
|
: QmlJSQuickFixOperation(state, 0)
|
|
, _objectInitializer(objectInitializer)
|
|
{
|
|
setDescription(QApplication::translate("QmlJSEditor::QuickFix",
|
|
"Split initializer"));
|
|
}
|
|
|
|
virtual void performChanges(QmlJSRefactoringFile *currentFile, QmlJSRefactoringChanges *)
|
|
{
|
|
Q_ASSERT(_objectInitializer != 0);
|
|
|
|
Utils::ChangeSet changes;
|
|
|
|
for (QmlJS::AST::UiObjectMemberList *it = _objectInitializer->members; it; it = it->next) {
|
|
if (QmlJS::AST::UiObjectMember *member = it->member) {
|
|
const QmlJS::AST::SourceLocation loc = member->firstSourceLocation();
|
|
|
|
// insert a newline at the beginning of this binding
|
|
changes.insert(currentFile->startOf(loc), QLatin1String("\n"));
|
|
}
|
|
}
|
|
|
|
// insert a newline before the closing brace
|
|
changes.insert(currentFile->startOf(_objectInitializer->rbraceToken),
|
|
QLatin1String("\n"));
|
|
|
|
currentFile->change(changes);
|
|
currentFile->indent(Range(currentFile->startOf(_objectInitializer->lbraceToken),
|
|
currentFile->startOf(_objectInitializer->rbraceToken)));
|
|
}
|
|
};
|
|
};
|
|
|
|
} // end of anonymous namespace
|
|
|
|
void QmlJSQuickFixCollector::registerQuickFixes(ExtensionSystem::IPlugin *plugIn)
|
|
{
|
|
plugIn->addAutoReleasedObject(new SplitInitializerOp);
|
|
plugIn->addAutoReleasedObject(new ComponentFromObjectDef);
|
|
}
|