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

Locator: Extract MatchLevel and use it in several filters

Browse Source 
... that already used index-based prioritising.

There are a few more with two- or three-level priority,
but these still use the old scheme with multiple lists
good/better/bestEntries and converting them would not
gain much.

Change-Id: I21f7cfe07a3ae8183db9cb62311697d03db6e4da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Andre Hartmann
2019-08-15 09:30:50 +02:00
committed by André Hartmann
parent 847108d4f4
commit 3b41b9b24b
7 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmljstools/qmljsfunctionfilter.cpp
View File

@@ -58,8 +58,7 @@ QList<Core::LocatorFilterEntry> FunctionFilter::matchesFor(
QFutureInterface<Core::LocatorFilterEntry> &future,
const QString &entry)
{
enum { Best = 0, Better, Good, EntryNumber };
QList<Core::LocatorFilterEntry> entries[EntryNumber];
QList<Core::LocatorFilterEntry> entries[int(MatchLevel::Count)];
const Qt::CaseSensitivity caseSensitivityForPrefix = caseSensitivity(entry);
const QRegularExpression regexp = createRegExp(entry);
@@ -83,11 +82,11 @@ QList<Core::LocatorFilterEntry> FunctionFilter::matchesFor(
filterEntry.highlightInfo = highlightInfo(match);
if (filterEntry.displayName.startsWith(entry, caseSensitivityForPrefix))
entries[Best].append(filterEntry);
entries[int(MatchLevel::Best)].append(filterEntry);
else if (filterEntry.displayName.contains(entry, caseSensitivityForPrefix))
entries[Better].append(filterEntry);
entries[int(MatchLevel::Better)].append(filterEntry);
else
entries[Good].append(filterEntry);
entries[int(MatchLevel::Good)].append(filterEntry);
}
}
}