feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Do not generate auxiliaryDataAsQML for offset -1

Browse Source 
If a node does not have a proper offset, then the data is inconsistent.

Change-Id: I1fbff3e169b225bc4ca00b1deb21982f30281f9a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2019-02-11 13:01:35 +01:00
parent b71a6eec20
commit 5f5e2543a5
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmldesigner/designercore/model/rewriterview.cpp
View File

@@ -486,6 +486,8 @@ QString RewriterView::auxiliaryDataAsQML() const
QString str = "Designer {\n "; QString str = "Designer {\n ";
QTC_ASSERT(!m_canonicalIntModelNode.isEmpty(), return {});
int columnCount = 0; int columnCount = 0;
for (const auto &node : allModelNodes()) { for (const auto &node : allModelNodes()) {
QHash<PropertyName, QVariant> data = node.auxiliaryData(); QHash<PropertyName, QVariant> data = node.auxiliaryData();
@@ -727,8 +729,11 @@ void RewriterView::setupCanonicalHashes() const
using myPair = std::pair<ModelNode,int>; using myPair = std::pair<ModelNode,int>;
std::vector<myPair> data; std::vector<myPair> data;
for (const ModelNode &node : allModelNodes()) for (const ModelNode &node : allModelNodes()) {
data.emplace_back(std::make_pair(node, nodeOffset(node))); int offset = nodeOffset(node);
QTC_ASSERT(offset > 0, qDebug() << Q_FUNC_INFO << "no offset" << node; return);
data.emplace_back(std::make_pair(node, offset));
}
std::sort(data.begin(), data.end(), [](myPair a, myPair b) { std::sort(data.begin(), data.end(), [](myPair a, myPair b) {
return a.second < b.second; return a.second < b.second;
@@ -1066,6 +1071,8 @@ void RewriterView::restoreAuxiliaryData()
setupCanonicalHashes(); setupCanonicalHashes();
QTC_ASSERT(!m_canonicalIntModelNode.isEmpty(), return);
const QString text = m_textModifier->text(); const QString text = m_textModifier->text();
int startIndex = text.indexOf(annotationsStart()); int startIndex = text.indexOf(annotationsStart());