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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp

Change-Id: Iaad0659293681cce4266fc3e4ba2a4f2068de911
This commit is contained in:
Eike Ziller
2017-10-09 12:09:27 +02:00
parent b1701ae933 86ff493b99
commit 07bec99e8f
256 changed files with 4735 additions and 4046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,6 @@
#include <coreplugin/editormanager/editormanager.h>
#include <utils/algorithm.h>
#include <utils/camelhumpmatcher.h>
#include <QRegularExpression>
@@ -61,9 +60,8 @@ QList<Core::LocatorFilterEntry> FunctionFilter::matchesFor(
QList<Core::LocatorFilterEntry> betterEntries;
QList<Core::LocatorFilterEntry> bestEntries;
const Qt::CaseSensitivity caseSensitivityForPrefix = caseSensitivity(entry);
const QRegularExpression regexp = containsWildcard(entry)
? createWildcardRegExp(entry) : CamelHumpMatcher::createCamelHumpRegExp(entry);
const QRegularExpression regexp = createRegExp(entry);
if (!regexp.isValid())
return goodEntries;
@@ -83,11 +81,8 @@ QList<Core::LocatorFilterEntry> FunctionFilter::matchesFor(
if (match.hasMatch()) {
QVariant id = qVariantFromValue(info);
Core::LocatorFilterEntry filterEntry(this, info.displayName, id/*, info.icon*/);
const CamelHumpMatcher::HighlightingPositions positions =
CamelHumpMatcher::highlightingPositions(match);
filterEntry.extraInfo = info.extraInfo;
filterEntry.highlightInfo.starts = positions.starts;
filterEntry.highlightInfo.lengths = positions.lengths;
filterEntry.highlightInfo = highlightInfo(match);
if (filterEntry.displayName.startsWith(entry, caseSensitivityForPrefix))
bestEntries.append(filterEntry);