From c1097cbe7ff29e50f3b3ab6077c8514950f8892a Mon Sep 17 00:00:00 2001 From: Przemyslaw Gorszkowski Date: Tue, 1 May 2018 09:52:18 +0200 Subject: [PATCH] SilverSearcherPlugin: fix searching if PATTERN starts with dash/hyphen Change-Id: I48a6d8a9748b5a8334b7972cae4294d4e8c1c740 Reviewed-by: Orgad Shaneh --- src/plugins/silversearcher/findinfilessilversearcher.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp index bb18277acdd..02f26132540 100644 --- a/src/plugins/silversearcher/findinfilessilversearcher.cpp +++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp @@ -105,9 +105,6 @@ void runSilverSeacher(FutureInterfaceType &fi, FileFindParameters parameters) for (const QString &filter : parameters.exclusionFilters) arguments << "--ignore" << filter; - FileName path = FileName::fromUserInput(FileUtils::normalizePathName(directory)); - arguments << parameters.text << path.toString(); - QString nameFiltersAsRegex; for (const QString &filter : parameters.nameFilters) nameFiltersAsRegex += QString("(%1)|").arg(convertWildcardToRegex(filter)); @@ -115,6 +112,9 @@ void runSilverSeacher(FutureInterfaceType &fi, FileFindParameters parameters) arguments << "-G" << nameFiltersAsRegex; + const FileName path = FileName::fromUserInput(FileUtils::normalizePathName(directory)); + arguments << "-- " << parameters.text << path.toString(); + QProcess process; process.start("ag", arguments); if (process.waitForFinished()) {