From 1750aab9b42cb454c8de0f0ff2faa0825797380e Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Wed, 12 Jun 2024 13:08:53 +0200 Subject: [PATCH] QmlDesinger: Fix typo in RewriterView function * Fix typo in RewriterView function * Update source with clang format Change-Id: Ic0b6f2a28120e04980a99fbacaa72f6897c513aa Reviewed-by: Thomas Hartmann --- .../components/componentcore/viewmanager.cpp | 4 +- .../designercore/include/rewriterview.h | 4 +- .../designercore/model/rewriterview.cpp | 177 +++++++++--------- 3 files changed, 96 insertions(+), 89 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp index a56735862f3..1ab5a012b2f 100644 --- a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp @@ -161,7 +161,7 @@ void ViewManager::attachRewriterView() }); currentModel()->setRewriterView(view); - view->reactivateTextMofifierChangeSignals(); + view->reactivateTextModifierChangeSignals(); view->restoreAuxiliaryData(); } @@ -171,7 +171,7 @@ void ViewManager::attachRewriterView() void ViewManager::detachRewriterView() { if (RewriterView *view = currentDesignDocument()->rewriterView()) { - view->deactivateTextMofifierChangeSignals(); + view->deactivateTextModifierChangeSignals(); currentModel()->setRewriterView(nullptr); } } diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h index 92c79c78631..c31f817cd9e 100644 --- a/src/plugins/qmldesigner/designercore/include/rewriterview.h +++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h @@ -90,8 +90,8 @@ public: void setTextModifier(TextModifier *textModifier); QString textModifierContent() const; - void reactivateTextMofifierChangeSignals(); - void deactivateTextMofifierChangeSignals(); + void reactivateTextModifierChangeSignals(); + void deactivateTextModifierChangeSignals(); void auxiliaryDataChanged(const ModelNode &node, AuxiliaryDataKeyView key, diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index 8905f95430c..74cf00ae7e4 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -3,9 +3,9 @@ #include "rewriterview.h" -#include "texttomodelmerger.h" -#include "modeltotextmerger.h" #include "model_p.h" +#include "modeltotextmerger.h" +#include "texttomodelmerger.h" #include #include @@ -36,9 +36,9 @@ #include #include +#include #include #include -#include using namespace QmlDesigner::Internal; using namespace Qt::StringLiterals; @@ -68,12 +68,21 @@ RewriterView::RewriterView(ExternalDependenciesInterface &externalDependencies, connect(&m_amendTimer, &QTimer::timeout, this, &RewriterView::amendQmlText); QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance(); - connect(modelManager, &QmlJS::ModelManagerInterface::libraryInfoUpdated, - this, &RewriterView::handleLibraryInfoUpdate, Qt::QueuedConnection); - connect(modelManager, &QmlJS::ModelManagerInterface::projectInfoUpdated, - this, &RewriterView::handleProjectUpdate, Qt::DirectConnection); - connect(this, &RewriterView::modelInterfaceProjectUpdated, - this, &RewriterView::handleLibraryInfoUpdate, Qt::QueuedConnection); + connect(modelManager, + &QmlJS::ModelManagerInterface::libraryInfoUpdated, + this, + &RewriterView::handleLibraryInfoUpdate, + Qt::QueuedConnection); + connect(modelManager, + &QmlJS::ModelManagerInterface::projectInfoUpdated, + this, + &RewriterView::handleProjectUpdate, + Qt::DirectConnection); + connect(this, + &RewriterView::modelInterfaceProjectUpdated, + this, + &RewriterView::handleLibraryInfoUpdate, + Qt::QueuedConnection); } RewriterView::~RewriterView() = default; @@ -104,7 +113,7 @@ void RewriterView::modelAttached(Model *model) if (hasIncompleteTypeInformation()) { m_modelAttachPending = true; - QTimer::singleShot(1000, this, [this, model](){ + QTimer::singleShot(1000, this, [this, model]() { modelAttached(model); restoreAuxiliaryData(); }); @@ -129,7 +138,9 @@ void RewriterView::nodeCreated(const ModelNode &createdNode) applyChanges(); } -void RewriterView::nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) +void RewriterView::nodeRemoved(const ModelNode &removedNode, + const NodeAbstractProperty &parentProperty, + PropertyChangeFlags propertyChange) { Q_ASSERT(textModifier()); if (textToModelMerger()->isActive()) @@ -153,13 +164,14 @@ void RewriterView::propertiesAboutToBeRemoved(const QList &pro if (!m_removeDefaultPropertyTransaction.isValid()) { m_removeDefaultPropertyTransaction = beginRewriterTransaction( - QByteArrayLiteral("RewriterView::propertiesAboutToBeRemoved")); + QByteArrayLiteral("RewriterView::propertiesAboutToBeRemoved")); } if (property.isNodeListProperty()) { const auto nodeList = property.toNodeListProperty().toModelNodeList(); for (const ModelNode &node : nodeList) { - modelToTextMerger()->nodeRemoved(node, property.toNodeAbstractProperty(), + modelToTextMerger()->nodeRemoved(node, + property.toNodeAbstractProperty(), AbstractView::NoAdditionalChanges); } } else if (property.isBindingProperty() || property.isVariantProperty() @@ -172,7 +184,7 @@ void RewriterView::propertiesAboutToBeRemoved(const QList &pro } } -void RewriterView::propertiesRemoved(const QList& propertyList) +void RewriterView::propertiesRemoved(const QList &propertyList) { Q_ASSERT(textModifier()); if (textToModelMerger()->isActive()) @@ -187,7 +199,8 @@ void RewriterView::propertiesRemoved(const QList& propertyList applyChanges(); } -void RewriterView::variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) +void RewriterView::variantPropertiesChanged(const QList &propertyList, + PropertyChangeFlags propertyChange) { Q_ASSERT(textModifier()); if (textToModelMerger()->isActive()) @@ -203,7 +216,8 @@ void RewriterView::variantPropertiesChanged(const QList& proper applyChanges(); } -void RewriterView::bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) +void RewriterView::bindingPropertiesChanged(const QList &propertyList, + PropertyChangeFlags propertyChange) { Q_ASSERT(textModifier()); if (textToModelMerger()->isActive()) @@ -219,7 +233,8 @@ void RewriterView::bindingPropertiesChanged(const QList& proper applyChanges(); } -void RewriterView::signalHandlerPropertiesChanged(const QVector &propertyList, AbstractView::PropertyChangeFlags propertyChange) +void RewriterView::signalHandlerPropertiesChanged(const QVector &propertyList, + AbstractView::PropertyChangeFlags propertyChange) { Q_ASSERT(textModifier()); if (textToModelMerger()->isActive()) @@ -235,7 +250,8 @@ void RewriterView::signalHandlerPropertiesChanged(const QVector &propertyList, PropertyChangeFlags propertyChange) +void RewriterView::signalDeclarationPropertiesChanged( + const QVector &propertyList, PropertyChangeFlags propertyChange) { Q_ASSERT(textModifier()); if (textToModelMerger()->isActive()) @@ -251,7 +267,10 @@ void RewriterView::signalDeclarationPropertiesChanged(const QVectorisActive()) @@ -293,7 +312,7 @@ void RewriterView::importsRemoved(const Imports &imports) applyChanges(); } -void RewriterView::nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) +void RewriterView::nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId) { Q_ASSERT(textModifier()); if (textToModelMerger()->isActive()) @@ -340,7 +359,7 @@ void RewriterView::nodeOrderChanged(const NodeListProperty &listProperty) void RewriterView::rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) { - Q_ASSERT(textModifier()); + Q_ASSERT(textModifier()); if (textToModelMerger()->isActive()) return; @@ -350,7 +369,10 @@ void RewriterView::rootNodeTypeChanged(const QString &type, int majorVersion, in applyChanges(); } -void RewriterView::nodeTypeChanged(const ModelNode &node, const TypeName &type, int majorVersion, int minorVersion) +void RewriterView::nodeTypeChanged(const ModelNode &node, + const TypeName &type, + int majorVersion, + int minorVersion) { Q_ASSERT(textModifier()); if (textToModelMerger()->isActive()) @@ -362,7 +384,10 @@ void RewriterView::nodeTypeChanged(const ModelNode &node, const TypeName &type, applyChanges(); } -void RewriterView::customNotification(const AbstractView * /*view*/, const QString &identifier, const QList & /* nodeList */, const QList & /*data */) +void RewriterView::customNotification(const AbstractView * /*view*/, + const QString &identifier, + const QList & /* nodeList */, + const QList & /*data */) { if (identifier == StartRewriterAmend || identifier == EndRewriterAmend) return; // we emitted this ourselves, so just ignore these notifications. @@ -378,8 +403,7 @@ void RewriterView::rewriterEndTransaction() { transactionLevel--; Q_ASSERT(transactionLevel >= 0); - if (transactionLevel == 0) - { + if (transactionLevel == 0) { setModificationGroupActive(false); applyModificationGroupChanges(); } @@ -419,13 +443,13 @@ QString RewriterView::textModifierContent() const return QString(); } -void RewriterView::reactivateTextMofifierChangeSignals() +void RewriterView::reactivateTextModifierChangeSignals() { if (textModifier()) textModifier()->reactivateChangeSignals(); } -void RewriterView::deactivateTextMofifierChangeSignals() +void RewriterView::deactivateTextModifierChangeSignals() { if (textModifier()) textModifier()->deactivateChangeSignals(); @@ -455,9 +479,14 @@ void RewriterView::applyChanges() if (inErrorState()) { const QString content = textModifierContent(); - qDebug().noquote() << "RewriterView::applyChanges() got called while in error state. Will do a quick-exit now."; + qDebug().noquote() << "RewriterView::applyChanges() got called while in error state. Will " + "do a quick-exit now."; qDebug().noquote() << "Content: " << content; - throw RewritingException(__LINE__, __FUNCTION__, __FILE__, "RewriterView::applyChanges() already in error state", content); + throw RewritingException(__LINE__, + __FUNCTION__, + __FILE__, + "RewriterView::applyChanges() already in error state", + content); } m_differenceHandling = Validate; @@ -481,13 +510,16 @@ void RewriterView::applyChanges() qDebug().noquote() << "Content: " << content; if (!errors().isEmpty()) qDebug().noquote() << "Error:" << errors().constFirst().description(); - throw RewritingException(__LINE__, __FUNCTION__, __FILE__, qPrintable(m_rewritingErrorMessage), content); + throw RewritingException(__LINE__, + __FUNCTION__, + __FILE__, + qPrintable(m_rewritingErrorMessage), + content); } } void RewriterView::amendQmlText() { - if (!model()->rewriterView()) return; @@ -518,38 +550,15 @@ static QString replaceIllegalPropertyNameChars(const QString &str) return ret; } -static bool idIsQmlKeyWord(const QString& id) +static bool idIsQmlKeyWord(const QString &id) { - static const QSet keywords = { - "as", - "break", - "case", - "catch", - "continue", - "debugger", - "default", - "delete", - "do", - "else", - "finally", - "for", - "function", - "if", - "import", - "in", - "instanceof", - "new", - "return", - "switch", - "this", - "throw", - "try", - "typeof", - "var", - "void", - "while", - "with" - }; + static const QSet keywords = {"as", "break", "case", "catch", + "continue", "debugger", "default", "delete", + "do", "else", "finally", "for", + "function", "if", "import", "in", + "instanceof", "new", "return", "switch", + "this", "throw", "try", "typeof", + "var", "void", "while", "with"}; return keywords.contains(id); } @@ -598,8 +607,7 @@ QString RewriterView::auxiliaryDataAsQML() const auto metaType = static_cast(value.type()); - if (metaType == QMetaType::QString - || metaType == QMetaType::QColor) { + if (metaType == QMetaType::QString || metaType == QMetaType::QColor) { strValue.replace("\\"_L1, "\\\\"_L1); strValue.replace("\""_L1, "\\\""_L1); strValue.replace("\t"_L1, "\\t"_L1); @@ -650,7 +658,8 @@ void RewriterView::sanitizeModel() QList danglingNodes; const auto danglingStates = root.allInvalidStateOperations(); - const auto danglingKeyframeGroups = QmlTimelineKeyframeGroup::allInvalidTimelineKeyframeGroups(this); + const auto danglingKeyframeGroups = QmlTimelineKeyframeGroup::allInvalidTimelineKeyframeGroups( + this); std::transform(danglingStates.begin(), danglingStates.end(), @@ -811,7 +820,7 @@ int RewriterView::firstDefinitionInsideOffset(const ModelNode &node) const int RewriterView::firstDefinitionInsideLength(const ModelNode &node) const { FirstDefinitionFinder firstDefinitionFinder(m_textModifier->text()); - const int offset = firstDefinitionFinder(nodeOffset(node)); + const int offset = firstDefinitionFinder(nodeOffset(node)); ObjectLengthCalculator objectLengthCalculator; unsigned length; @@ -833,7 +842,7 @@ static bool isInNodeDefinition(int nodeTextOffset, int nodeTextLength, int curso ModelNode RewriterView::nodeAtTextCursorPositionHelper(const ModelNode &root, int cursorPosition) const { - using myPair = std::pair; + using myPair = std::pair; std::vector data; for (const ModelNode &node : allModelNodes()) { @@ -842,9 +851,7 @@ ModelNode RewriterView::nodeAtTextCursorPositionHelper(const ModelNode &root, in data.emplace_back(std::make_pair(node, offset)); } - std::sort(data.begin(), data.end(), [](myPair a, myPair b) { - return a.second < b.second; - }); + std::sort(data.begin(), data.end(), [](myPair a, myPair b) { return a.second < b.second; }); ModelNode lastNode = root; @@ -852,7 +859,8 @@ ModelNode RewriterView::nodeAtTextCursorPositionHelper(const ModelNode &root, in ModelNode node = pair.first; const int nodeTextOffset = nodeOffset(node); - const int nodeTextLength = m_textModifier->text().indexOf("}", nodeTextOffset) - nodeTextOffset - 1; + const int nodeTextLength = m_textModifier->text().indexOf("}", nodeTextOffset) + - nodeTextOffset - 1; if (isInNodeDefinition(nodeTextOffset, nodeTextLength, cursorPosition)) lastNode = node; @@ -868,7 +876,7 @@ void RewriterView::setupCanonicalHashes() const m_canonicalIntModelNode.clear(); m_canonicalModelNodeInt.clear(); - using myPair = std::pair; + using myPair = std::pair; std::vector data; for (const ModelNode &node : allModelNodes()) { @@ -877,9 +885,7 @@ void RewriterView::setupCanonicalHashes() const data.emplace_back(std::make_pair(node, offset)); } - std::sort(data.begin(), data.end(), [](myPair a, myPair b) { - return a.second < b.second; - }); + std::sort(data.begin(), data.end(), [](myPair a, myPair b) { return a.second < b.second; }); int i = 0; for (const myPair &pair : data) { @@ -909,26 +915,28 @@ ModelNode RewriterView::nodeAtTextCursorPosition(int cursorPosition) const return nodeAtTextCursorPositionHelper(rootModelNode(), cursorPosition); } -bool RewriterView::renameId(const QString& oldId, const QString& newId) +bool RewriterView::renameId(const QString &oldId, const QString &newId) { if (textModifier()) { PropertyName propertyName = oldId.toUtf8(); bool hasAliasExport = rootModelNode().isValid() - && rootModelNode().hasBindingProperty(propertyName) - && rootModelNode().bindingProperty(propertyName).isAliasExport(); + && rootModelNode().hasBindingProperty(propertyName) + && rootModelNode().bindingProperty(propertyName).isAliasExport(); bool instant = m_instantQmlTextUpdate; m_instantQmlTextUpdate = true; - bool refactoring = textModifier()->renameId(oldId, newId); + bool refactoring = textModifier()->renameId(oldId, newId); m_instantQmlTextUpdate = instant; if (refactoring && hasAliasExport) { //Keep export alias properties rootModelNode().removeProperty(propertyName); PropertyName newPropertyName = newId.toUtf8(); - rootModelNode().bindingProperty(newPropertyName).setDynamicTypeNameAndExpression("alias", QString::fromUtf8(newPropertyName)); + rootModelNode() + .bindingProperty(newPropertyName) + .setDynamicTypeNameAndExpression("alias", QString::fromUtf8(newPropertyName)); } return refactoring; } @@ -1002,7 +1010,7 @@ QStringList RewriterView::importDirectories() const return Utils::transform(list, [](const Utils::FilePath &p) { return p.toString(); }); } -QSet > RewriterView::qrcMapping() const +QSet> RewriterView::qrcMapping() const { return m_textToModelMerger->qrcMapping(); } @@ -1116,8 +1124,7 @@ QList RewriterView::getQMLTypes() const for (const QmlJS::ModelManagerInterface::CppData &cppData : QmlJS::ModelManagerInterface::instance()->cppData()) for (const LanguageUtils::FakeMetaObject::ConstPtr &fakeMetaObject : cppData.exportedTypes) { - for (const LanguageUtils::FakeMetaObject::Export &exportItem : - fakeMetaObject->exports()) { + for (const LanguageUtils::FakeMetaObject::Export &exportItem : fakeMetaObject->exports()) { QmlTypeData qmlData; qmlData.cppClassName = fakeMetaObject->className(); qmlData.typeName = exportItem.type; @@ -1134,7 +1141,7 @@ QList RewriterView::getQMLTypes() const return qmlDataList; } -void RewriterView::setWidgetStatusCallback(std::function setWidgetStatusCallback) +void RewriterView::setWidgetStatusCallback(std::function setWidgetStatusCallback) { m_setWidgetStatusCallback = setWidgetStatusCallback; } @@ -1303,4 +1310,4 @@ void RewriterView::restoreAuxiliaryData() m_restoringAuxData = false; } -} //QmlDesigner +} // namespace QmlDesigner