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

SilverSearcherPlugin: fix searching if PATTERN starts with dash/hyphen

Browse Source 
Change-Id: I48a6d8a9748b5a8334b7972cae4294d4e8c1c740
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Przemyslaw Gorszkowski
2018-05-01 09:52:18 +02:00
parent 142ae0cdf9
commit c1097cbe7f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/silversearcher/findinfilessilversearcher.cpp
View File

@@ -105,9 +105,6 @@ void runSilverSeacher(FutureInterfaceType &fi, FileFindParameters parameters)
for (const QString &filter : parameters.exclusionFilters) for (const QString &filter : parameters.exclusionFilters)
arguments << "--ignore" << filter; arguments << "--ignore" << filter;
FileName path = FileName::fromUserInput(FileUtils::normalizePathName(directory));
arguments << parameters.text << path.toString();
QString nameFiltersAsRegex; QString nameFiltersAsRegex;
for (const QString &filter : parameters.nameFilters) for (const QString &filter : parameters.nameFilters)
nameFiltersAsRegex += QString("(%1)|").arg(convertWildcardToRegex(filter)); nameFiltersAsRegex += QString("(%1)|").arg(convertWildcardToRegex(filter));
@@ -115,6 +112,9 @@ void runSilverSeacher(FutureInterfaceType &fi, FileFindParameters parameters)
arguments << "-G" << nameFiltersAsRegex; arguments << "-G" << nameFiltersAsRegex;
const FileName path = FileName::fromUserInput(FileUtils::normalizePathName(directory));
arguments << "-- " << parameters.text << path.toString();
QProcess process; QProcess process;
process.start("ag", arguments); process.start("ag", arguments);
if (process.waitForFinished()) { if (process.waitForFinished()) {