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

QmlJsDelta: Fix the fact that sometimes, when inserting items, the new item could match the next item

Browse Source
This commit is contained in:
Olivier Goffart
2010-07-26 13:03:44 +02:00
parent 001e759b2a
commit 0ba5dc8d58
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/qmljs/qmljsdelta.cpp
View File

@@ -185,12 +185,20 @@ Map MatchFragment(UiObjectMember *x, UiObjectMember *y, const Map &M, Document::
QList<UiObjectMember *> list2 = children(y);
for (int i = 0; i < list1.count(); i++) {
QString l = label(list1[i], doc1);
int foundJ = -1;
Map M3;
for (int j = 0; j < list2.count(); j++) {
if (l != label(list2[j], doc2))
continue;
M2 += MatchFragment(list1[i], list2[j], M, doc1, doc2);
list2.removeAt(j);
break;
Map M4 = MatchFragment(list1[i], list2[j], M, doc1, doc2);
if (M4.count() > M3.count()) {
M3 = M4;
foundJ = j;
}
}
if (foundJ != -1) {
list2.removeAt(foundJ);
M2 += M3;
}
}
return M2;