From 8d08196a21184330f18343921f523966d778a739 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 3 Dec 2021 12:22:16 +0100 Subject: Fix crash when removing built-in snippets Snippets collection managed the snippets with persistent iterators to the "end" of the active snippets. Qt 5's QList was nicely updating iterators even on non-const operations, but that has changed in Qt 6. Don't use iterators, simply work with the count of active items. Fixes: QTCREATORBUG-26648 Task-number: QTCREATORBUG-24098 Change-Id: Icc13274daf0e87d0562d80d7bc763c863d5da075 Reviewed-by: Qt CI Bot Reviewed-by: David Schulz --- .../texteditor/snippets/snippetscollection.cpp | 46 ++++++++++++---------- 1 file changed, 26 insertions(+), 20 deletions(-) (limited to 'src/plugins/texteditor/snippets/snippetscollection.cpp') diff --git a/src/plugins/texteditor/snippets/snippetscollection.cpp b/src/plugins/texteditor/snippets/snippetscollection.cpp index d47e50fdf7..61a94bc437 100644 --- a/src/plugins/texteditor/snippets/snippetscollection.cpp +++ b/src/plugins/texteditor/snippets/snippetscollection.cpp @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -112,7 +113,7 @@ void SnippetsCollection::insertSnippet(const Snippet &snippet, const Hint &hint) { const int group = groupIndex(snippet.groupId()); if (snippet.isBuiltIn() && snippet.isRemoved()) { - m_activeSnippetsEnd[group] = m_snippets[group].insert(m_activeSnippetsEnd[group], snippet); + m_snippets[group].append(snippet); } else { m_snippets[group].insert(hint.m_it, snippet); updateActiveSnippetsEnd(group); @@ -123,8 +124,11 @@ SnippetsCollection::Hint SnippetsCollection::computeInsertionHint(const Snippet { const int group = groupIndex(snippet.groupId()); QList &snippets = m_snippets[group]; - QList::iterator it = std::upper_bound(snippets.begin(), m_activeSnippetsEnd.at(group), - snippet, snippetComp); + QList::iterator it = std::upper_bound(snippets.begin(), + snippets.begin() + + m_activeSnippetsCount.at(group), + snippet, + snippetComp); return Hint(static_cast(std::distance(snippets.begin(), it)), it); } @@ -158,12 +162,15 @@ SnippetsCollection::Hint SnippetsCollection::computeReplacementHint(int index, { const int group = groupIndex(snippet.groupId()); QList &snippets = m_snippets[group]; - QList::iterator it = std::lower_bound(snippets.begin(), m_activeSnippetsEnd.at(group), - snippet, snippetComp); + auto activeSnippetsEnd = snippets.begin() + m_activeSnippetsCount.at(group); + QList::iterator it = std::lower_bound(snippets.begin(), + activeSnippetsEnd, + snippet, + snippetComp); int hintIndex = static_cast(std::distance(snippets.begin(), it)); if (index < hintIndex - 1) return Hint(hintIndex - 1, it); - it = std::upper_bound(it, m_activeSnippetsEnd.at(group), snippet, snippetComp); + it = std::upper_bound(it, activeSnippetsEnd, snippet, snippetComp); hintIndex = static_cast(std::distance(snippets.begin(), it)); if (index > hintIndex) return Hint(hintIndex, it); @@ -176,11 +183,10 @@ void SnippetsCollection::removeSnippet(int index, const QString &groupId) const int group = groupIndex(groupId); Snippet snippet(m_snippets.at(group).at(index)); m_snippets[group].removeAt(index); + updateActiveSnippetsEnd(group); if (snippet.isBuiltIn()) { snippet.setIsRemoved(true); - m_activeSnippetsEnd[group] = m_snippets[group].insert(m_activeSnippetsEnd[group], snippet); - } else { - updateActiveSnippetsEnd(group); + m_snippets[group].append(snippet); } } @@ -202,8 +208,7 @@ void SnippetsCollection::setSnippetContent(int index, int SnippetsCollection::totalActiveSnippets(const QString &groupId) const { const int group = groupIndex(groupId); - return std::distance::const_iterator>(m_snippets.at(group).begin(), - QList::const_iterator(m_activeSnippetsEnd.at(group))); + return m_activeSnippetsCount.at(group); } int SnippetsCollection::totalSnippets(const QString &groupId) const @@ -225,14 +230,14 @@ void SnippetsCollection::clearSnippets() void SnippetsCollection::clearSnippets(int groupIndex) { m_snippets[groupIndex].clear(); - m_activeSnippetsEnd[groupIndex] = m_snippets[groupIndex].end(); + m_activeSnippetsCount[groupIndex] = m_snippets[groupIndex].size(); } void SnippetsCollection::updateActiveSnippetsEnd(int groupIndex) { - m_activeSnippetsEnd[groupIndex] = std::find_if(m_snippets[groupIndex].begin(), - m_snippets[groupIndex].end(), - [](const Snippet &s) { return s.isRemoved(); }); + const int index = Utils::indexOf(m_snippets[groupIndex], + [](const Snippet &s) { return s.isRemoved(); }); + m_activeSnippetsCount[groupIndex] = index < 0 ? m_snippets[groupIndex].size() : index; } void SnippetsCollection::restoreRemovedSnippets(const QString &groupId) @@ -240,9 +245,10 @@ void SnippetsCollection::restoreRemovedSnippets(const QString &groupId) // The version restored contains the last modifications (if any) by the user. // Reverting the snippet can still bring it to the original version const int group = groupIndex(groupId); - QVector toRestore(std::distance(m_activeSnippetsEnd[group], m_snippets[group].end())); - std::copy(m_activeSnippetsEnd[group], m_snippets[group].end(), toRestore.begin()); - m_snippets[group].erase(m_activeSnippetsEnd[group], m_snippets[group].end()); + if (m_activeSnippetsCount[group] == m_snippets[group].size()) // no removed snippets + return; + const QVector toRestore = m_snippets[group].mid(m_activeSnippetsCount[group]); + m_snippets[group].resize(m_activeSnippetsCount[group]); for (Snippet snippet : qAsConst(toRestore)) { snippet.setIsRemoved(false); insertSnippet(snippet); @@ -425,8 +431,8 @@ void SnippetsCollection::identifyGroups() const int groupIndex = m_groupIndexById.size(); m_groupIndexById.insert(provider.groupId(), groupIndex); m_snippets.resize(groupIndex + 1); - m_activeSnippetsEnd.resize(groupIndex + 1); - m_activeSnippetsEnd[groupIndex] = m_snippets[groupIndex].end(); + m_activeSnippetsCount.resize(groupIndex + 1); + m_activeSnippetsCount[groupIndex] = m_snippets[groupIndex].size(); } reload(); -- cgit v1.2.1