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

Editor: add specialized snippet overlay

Browse Source 
Split out the snippet functionality into a new derived
overlay implementation.

Change-Id: I2d7fffabe16ce6348ed067eb52ff221420a23285
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2021-04-16 09:35:46 +02:00
parent 8b59604bd4
commit b3c2120dff
3 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/texteditor/texteditoroverlay.cpp
View File

@@ -72,8 +72,6 @@ void TextEditorOverlay::clear()
return;
m_selections.clear();
m_firstSelectionOriginalBegin = -1;
m_equivalentSelections.clear();
m_manglers.clear();
update();
}
@@ -481,13 +479,27 @@ QTextCursor TextEditorOverlay::assembleCursorForSelection(int selectionIndex) co
return cursor;
}
void TextEditorOverlay::mapEquivalentSelections()
bool TextEditorOverlay::hasFirstSelectionBeginMoved() const
{
if (m_firstSelectionOriginalBegin == -1 || m_selections.isEmpty())
return false;
return m_selections.at(0).m_cursor_begin.position() != m_firstSelectionOriginalBegin;
}
void SnippetOverlay::clear()
{
TextEditorOverlay::clear();
m_equivalentSelections.clear();
m_manglers.clear();
}
void SnippetOverlay::mapEquivalentSelections()
{
m_equivalentSelections.clear();
m_equivalentSelections.resize(m_selections.size());
m_equivalentSelections.resize(selections().size());
QMultiMap<QString, int> all;
for (int i = 0; i < m_selections.size(); ++i)
for (int i = 0; i < selections().size(); ++i)
all.insert(selectionText(i).toLower(), i);
const QList<QString> &uniqueKeys = all.uniqueKeys();
@@ -506,7 +518,7 @@ void TextEditorOverlay::mapEquivalentSelections()
}
}
void TextEditorOverlay::updateEquivalentSelections(const QTextCursor &cursor)
void SnippetOverlay::updateEquivalentSelections(const QTextCursor &cursor)
{
int selectionIndex = selectionIndexForCursor(cursor);
if (selectionIndex == -1)
@@ -528,12 +540,12 @@ void TextEditorOverlay::updateEquivalentSelections(const QTextCursor &cursor)
}
}
void TextEditorOverlay::setNameMangler(const QList<NameMangler *> &manglers)
void SnippetOverlay::setNameMangler(const QList<NameMangler *> &manglers)
{
m_manglers = manglers;
}
void TextEditorOverlay::mangle()
void SnippetOverlay::mangle()
{
for (int i = 0; i < m_manglers.count(); ++i) {
if (!m_manglers.at(i))
@@ -550,10 +562,3 @@ void TextEditorOverlay::mangle()
}
}
}
bool TextEditorOverlay::hasFirstSelectionBeginMoved() const
{
if (m_firstSelectionOriginalBegin == -1 || m_selections.isEmpty())
return false;
return m_selections.at(0).m_cursor_begin.position() != m_firstSelectionOriginalBegin;
}