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

Locator: Remove whitespace from start and end

Browse Source 
It is not very intuitive, and can easily happen when copy&pasting into
locator.

Change-Id: I51d226b8e834c43eedc042035a9b90aa7ee4844f
Task-number: QTCREATORBUG-15399
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-12-04 13:20:23 +01:00
parent 4a06fc63a9
commit b6e4e966f4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/coreplugin/locator/locatorwidget.cpp
View File

@@ -464,24 +464,25 @@ void LocatorWidget::showPopupNow()
QList<ILocatorFilter *> LocatorWidget::filtersFor(const QString &text, QString &searchText) QList<ILocatorFilter *> LocatorWidget::filtersFor(const QString &text, QString &searchText)
{ {
const QString trimmedText = text.trimmed();
QList<ILocatorFilter *> filters = m_locatorPlugin->filters(); QList<ILocatorFilter *> filters = m_locatorPlugin->filters();
const int whiteSpace = text.indexOf(QLatin1Char(' ')); const int whiteSpace = trimmedText.indexOf(QLatin1Char(' '));
QString prefix; QString prefix;
if (whiteSpace >= 0) if (whiteSpace >= 0)
prefix = text.left(whiteSpace); prefix = trimmedText.left(whiteSpace);
if (!prefix.isEmpty()) { if (!prefix.isEmpty()) {
prefix = prefix.toLower(); prefix = prefix.toLower();
QList<ILocatorFilter *> prefixFilters; QList<ILocatorFilter *> prefixFilters;
foreach (ILocatorFilter *filter, filters) { foreach (ILocatorFilter *filter, filters) {
if (prefix == filter->shortcutString()) { if (prefix == filter->shortcutString()) {
searchText = text.mid(whiteSpace+1); searchText = trimmedText.mid(whiteSpace).trimmed();
prefixFilters << filter; prefixFilters << filter;
} }
} }
if (!prefixFilters.isEmpty()) if (!prefixFilters.isEmpty())
return prefixFilters; return prefixFilters;
} }
searchText = text; searchText = trimmedText;
QList<ILocatorFilter *> activeFilters; QList<ILocatorFilter *> activeFilters;
foreach (ILocatorFilter *filter, filters) foreach (ILocatorFilter *filter, filters)
if (filter->isIncludedByDefault()) if (filter->isIncludedByDefault())