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

LanguageClient: select innermost outline widget item

Browse Source 
Reuse the code that selects the innermost item in the outline combobox
also in the widget so the behavior is consistent.

(cherry picked from commit b97204ebb6)
Change-Id: Ie7c32ba4e6c5cbdd608da207e515c737e3bd91e6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2022-02-04 07:30:06 +01:00
parent 1eabb6f185
commit 4661a4946d
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/languageclient/languageclientoutline.cpp
View File

@@ -216,17 +216,30 @@ void LanguageClientOutlineWidget::updateTextCursor(const QModelIndex &proxyIndex
m_editor->editorWidget()->gotoLine(pos.line() + 1, pos.character(), true, true);
}
static LanguageClientOutlineItem *itemForCursor(const LanguageClientOutlineModel &m_model,
const QTextCursor &cursor)
{
const Position pos(cursor);
LanguageClientOutlineItem *result = nullptr;
m_model.forAllItems([&](LanguageClientOutlineItem *candidate){
if (!candidate->contains(pos))
return;
if (result && candidate->range().contains(result->range()))
return; // skip item if the range is equal or bigger than the previous found range
result = candidate;
});
return result;
}
void LanguageClientOutlineWidget::updateSelectionInTree(const QTextCursor &currentCursor)
{
QItemSelection selection;
const Position pos(currentCursor);
m_model.forAllItems([&](const LanguageClientOutlineItem *item) {
if (item->contains(pos))
selection.select(m_model.indexForItem(item), m_model.indexForItem(item));
});
m_view.selectionModel()->select(selection, QItemSelectionModel::ClearAndSelect);
if (!selection.isEmpty())
m_view.scrollTo(selection.indexes().first());
if (LanguageClientOutlineItem *item = itemForCursor(m_model, currentCursor)) {
const QModelIndex index = m_model.indexForItem(item);
m_view.selectionModel()->select(index, QItemSelectionModel::ClearAndSelect);
m_view.scrollTo(index);
} else {
m_view.clearSelection();
}
}
void LanguageClientOutlineWidget::onItemActivated(const QModelIndex &index)
@@ -346,17 +359,8 @@ void OutlineComboBox::updateModel(const DocumentUri &resultUri, const DocumentSy
void OutlineComboBox::updateEntry()
{
const Position pos(m_editorWidget->textCursor());
LanguageClientOutlineItem *itemForCursor = nullptr;
m_model.forAllItems([&](LanguageClientOutlineItem *candidate){
if (!candidate->contains(pos))
return;
if (itemForCursor && candidate->range().contains(itemForCursor->range()))
return; // skip item if the range is equal or bigger than the previous found range
itemForCursor = candidate;
});
if (itemForCursor)
setCurrentIndex(m_model.indexForItem(itemForCursor));
if (LanguageClientOutlineItem *item = itemForCursor(m_model, m_editorWidget->textCursor()))
setCurrentIndex(m_model.indexForItem(item));
}
void OutlineComboBox::activateEntry()