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

JsonFieldPage: Fix collecting the results from all matchers

Browse Source 
Connect to LocatorMatcher::done() signal instead of to
serialOutputDataReady() in order to get all the results
available (not just 1st partial results).

Give locator matcher a parent to avoid possible leak.

Amends 1cc7342ef1

Change-Id: Ie4a73a5b2dd25f22616bd30a13eb7393c96a890f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2023-04-21 10:19:53 +02:00
parent f21e2ff65c
commit 16100acdc9
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
View File

@@ -599,10 +599,14 @@ void LineEditField::setupCompletion(FancyLineEdit *lineEdit)
using namespace Utils; using namespace Utils;
if (m_completion == Completion::None) if (m_completion == Completion::None)
return; return;
const auto handleResults = [this, lineEdit](const LocatorFilterEntries &entries) { LocatorMatcher *matcher = new LocatorMatcher;
matcher->setParent(lineEdit);
matcher->setTasks(LocatorMatcher::matchers(MatcherType::Classes));
const auto handleResults = [lineEdit, matcher, completion = m_completion] {
QSet<QString> namespaces; QSet<QString> namespaces;
QStringList classes; QStringList classes;
Project * const project = ProjectTree::currentProject(); Project * const project = ProjectTree::currentProject();
const LocatorFilterEntries entries = matcher->outputData();
for (const LocatorFilterEntry &entry : entries) { for (const LocatorFilterEntry &entry : entries) {
static const auto isReservedName = [](const QString &name) { static const auto isReservedName = [](const QString &name) {
static const QRegularExpression rx1("^_[A-Z].*"); static const QRegularExpression rx1("^_[A-Z].*");
@@ -623,7 +627,7 @@ void LineEditField::setupCompletion(FancyLineEdit *lineEdit)
if (hasNamespace) { if (hasNamespace) {
if (isBaseClassCandidate) if (isBaseClassCandidate)
classes << (entry.extraInfo + "::" + entry.displayName); classes << (entry.extraInfo + "::" + entry.displayName);
if (m_completion == Completion::Namespaces) { if (completion == Completion::Namespaces) {
if (!project if (!project
|| entry.filePath.startsWith(project->projectDirectory().toString())) { || entry.filePath.startsWith(project->projectDirectory().toString())) {
namespaces << entry.extraInfo; namespaces << entry.extraInfo;
@@ -632,7 +636,7 @@ void LineEditField::setupCompletion(FancyLineEdit *lineEdit)
} }
} }
QStringList completionList; QStringList completionList;
if (m_completion == Completion::Namespaces) { if (completion == Completion::Namespaces) {
completionList = toList(namespaces); completionList = toList(namespaces);
completionList = filtered(completionList, [&classes](const QString &ns) { completionList = filtered(completionList, [&classes](const QString &ns) {
return !classes.contains(ns); return !classes.contains(ns);
@@ -646,9 +650,7 @@ void LineEditField::setupCompletion(FancyLineEdit *lineEdit)
completionList.sort(); completionList.sort();
lineEdit->setSpecialCompleter(new QCompleter(completionList, lineEdit)); lineEdit->setSpecialCompleter(new QCompleter(completionList, lineEdit));
}; };
LocatorMatcher *matcher = new LocatorMatcher; QObject::connect(matcher, &LocatorMatcher::done, lineEdit, handleResults);
matcher->setTasks(LocatorMatcher::matchers(MatcherType::Classes));
QObject::connect(matcher, &LocatorMatcher::serialOutputDataReady, lineEdit, handleResults);
QObject::connect(matcher, &LocatorMatcher::done, matcher, &QObject::deleteLater); QObject::connect(matcher, &LocatorMatcher::done, matcher, &QObject::deleteLater);
matcher->start(); matcher->start();
} }