forked from qt-creator/qt-creator
Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
187 lines
6.9 KiB
C++
187 lines
6.9 KiB
C++
/****************************************************************************
|
|
**
|
|
** 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://www.qt.io/licensing. For further information
|
|
** use the contact form at http://www.qt.io/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 or version 3 as published by the Free
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
** following information to ensure the GNU Lesser General Public License
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
** 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 "qmljsquickfix.h"
|
|
#include "qmljscomponentfromobjectdef.h"
|
|
#include "qmljswrapinloader.h"
|
|
#include "qmljseditor.h"
|
|
#include "qmljsquickfixassist.h"
|
|
|
|
#include <extensionsystem/iplugin.h>
|
|
#include <extensionsystem/pluginmanager.h>
|
|
#include <qmljs/parser/qmljsast_p.h>
|
|
#include <qmljstools/qmljsrefactoringchanges.h>
|
|
|
|
#include <QApplication>
|
|
|
|
using namespace QmlJS;
|
|
using namespace QmlJS::AST;
|
|
using namespace QmlJSTools;
|
|
using TextEditor::RefactoringChanges;
|
|
|
|
namespace QmlJSEditor {
|
|
|
|
using namespace Internal;
|
|
|
|
namespace {
|
|
|
|
/*
|
|
Reformats a one-line object into a multi-line one, i.e.
|
|
Item { x: 10; y: 20; width: 10 }
|
|
into
|
|
Item {
|
|
x: 10;
|
|
y: 20;
|
|
width: 10
|
|
}
|
|
*/
|
|
class SplitInitializerOp: public QmlJSQuickFixFactory
|
|
{
|
|
void match(const QmlJSQuickFixInterface &interface, QuickFixOperations &result)
|
|
{
|
|
UiObjectInitializer *objectInitializer = 0;
|
|
|
|
const int pos = interface->currentFile()->cursor().position();
|
|
|
|
if (QmlJS::AST::Node *member = interface->semanticInfo().rangeAt(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)
|
|
result.append(new Operation(interface, objectInitializer));
|
|
}
|
|
|
|
class Operation: public QmlJSQuickFixOperation
|
|
{
|
|
UiObjectInitializer *_objectInitializer;
|
|
|
|
public:
|
|
Operation(const QSharedPointer<const QmlJSQuickFixAssistInterface> &interface,
|
|
UiObjectInitializer *objectInitializer)
|
|
: QmlJSQuickFixOperation(interface, 0)
|
|
, _objectInitializer(objectInitializer)
|
|
{
|
|
setDescription(QApplication::translate("QmlJSEditor::QuickFix",
|
|
"Split Initializer"));
|
|
}
|
|
|
|
void performChanges(QmlJSRefactoringFilePtr currentFile,
|
|
const 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->setChangeSet(changes);
|
|
currentFile->appendIndentRange(Range(currentFile->startOf(_objectInitializer->lbraceToken),
|
|
currentFile->startOf(_objectInitializer->rbraceToken)));
|
|
currentFile->apply();
|
|
}
|
|
};
|
|
};
|
|
|
|
/*
|
|
Adds a comment to suppress a static analysis message
|
|
*/
|
|
class AddAnalysisMessageSuppressionComment: public QmlJSQuickFixFactory
|
|
{
|
|
Q_DECLARE_TR_FUNCTIONS(QmlJSEditor::AddAnalysisMessageSuppressionComment)
|
|
public:
|
|
void match(const QmlJSQuickFixInterface &interface, QuickFixOperations &result)
|
|
{
|
|
const QList<StaticAnalysis::Message> &messages = interface->semanticInfo().staticAnalysisMessages;
|
|
|
|
foreach (const StaticAnalysis::Message &message, messages) {
|
|
if (interface->currentFile()->isCursorOn(message.location)) {
|
|
result.append(new Operation(interface, message));
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
private:
|
|
class Operation: public QmlJSQuickFixOperation
|
|
{
|
|
StaticAnalysis::Message _message;
|
|
|
|
public:
|
|
Operation(const QSharedPointer<const QmlJSQuickFixAssistInterface> &interface,
|
|
const StaticAnalysis::Message &message)
|
|
: QmlJSQuickFixOperation(interface, 0)
|
|
, _message(message)
|
|
{
|
|
setDescription(AddAnalysisMessageSuppressionComment::tr("Add a Comment to Suppress This Message"));
|
|
}
|
|
|
|
virtual void performChanges(QmlJSRefactoringFilePtr currentFile,
|
|
const QmlJSRefactoringChanges &)
|
|
{
|
|
Utils::ChangeSet changes;
|
|
const int insertLoc = _message.location.begin() - _message.location.startColumn + 1;
|
|
changes.insert(insertLoc, QString::fromLatin1("// %1\n").arg(_message.suppressionString()));
|
|
currentFile->setChangeSet(changes);
|
|
currentFile->appendIndentRange(Range(insertLoc, insertLoc + 1));
|
|
currentFile->apply();
|
|
}
|
|
};
|
|
};
|
|
|
|
} // end of anonymous namespace
|
|
|
|
void registerQuickFixes(ExtensionSystem::IPlugin *plugIn)
|
|
{
|
|
plugIn->addAutoReleasedObject(new SplitInitializerOp);
|
|
plugIn->addAutoReleasedObject(new ComponentFromObjectDef);
|
|
plugIn->addAutoReleasedObject(new WrapInLoader);
|
|
plugIn->addAutoReleasedObject(new AddAnalysisMessageSuppressionComment);
|
|
}
|
|
|
|
} // namespace QmlJSEditor
|