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

SilverSearcher: Rename output into input

Browse Source 
The passed text is an output from the ag command,
but, as seen from the parser point of view, that's
the input data for the parser.

Change-Id: Ic5d42406fd5ff1f52969fde3c2d44aaa34b9133b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2023-06-01 01:09:26 +02:00
parent a3bb39d3c3
commit 5e8795b353
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ SearchResultItem searchResult(const FilePath &fileName, const QString &matchingL
void OutputParserTest::test_data()
{
QTest::addColumn<QString>("parserOutput");
QTest::addColumn<QString>("input");
QTest::addColumn<SearchResultItems>("results");
QTest::addRow("nothing") << QString("\n") << SearchResultItems();
@@ -59,9 +59,9 @@ void OutputParserTest::test_data()
void OutputParserTest::test()
{
QFETCH(QString, parserOutput);
QFETCH(QString, input);
QFETCH(SearchResultItems, results);
const SearchResultItems items = SilverSearcher::parse(parserOutput);
const SearchResultItems items = SilverSearcher::parse(input);
QCOMPARE(items, results);
}

38
src/plugins/silversearcher/silversearcheroutputparser.cpp
View File

@@ -19,16 +19,16 @@ namespace SilverSearcher {
10;8 2,35 2:PropertyAbstractContainer::PropertyAbstractContainer()
*/
static QStringView nextLine(QStringView *remainingOutput)
static QStringView nextLine(QStringView *remainingInput)
{
const int newLinePos = remainingOutput->indexOf('\n');
const int newLinePos = remainingInput->indexOf('\n');
if (newLinePos < 0) {
QStringView ret = *remainingOutput;
*remainingOutput = QStringView();
QStringView ret = *remainingInput;
*remainingInput = QStringView();
return ret;
}
QStringView ret = remainingOutput->left(newLinePos);
*remainingOutput = remainingOutput->mid(newLinePos + 1);
QStringView ret = remainingInput->left(newLinePos);
*remainingInput = remainingInput->mid(newLinePos + 1);
return ret;
}
@@ -45,16 +45,16 @@ static bool parseNumber(QStringView numberString, int *number)
return ok;
}
static bool parseLineNumber(QStringView *remainingOutput, int *lineNumber)
static bool parseLineNumber(QStringView *remainingInput, int *lineNumber)
{
const int lineNumberDelimiterPos = remainingOutput->indexOf(';');
const int lineNumberDelimiterPos = remainingInput->indexOf(';');
if (lineNumberDelimiterPos < 0)
return false;
if (!parseNumber(remainingOutput->left(lineNumberDelimiterPos), lineNumber))
if (!parseNumber(remainingInput->left(lineNumberDelimiterPos), lineNumber))
return false;
*remainingOutput = remainingOutput->mid(lineNumberDelimiterPos + 1);
*remainingInput = remainingInput->mid(lineNumberDelimiterPos + 1);
return true;
}
@@ -76,13 +76,13 @@ static bool parseLineHit(QStringView hitString, QPair<int, int> *hit)
return true;
}
static bool parseLineHits(QStringView *remainingOutput, QList<QPair<int, int>> *hits)
static bool parseLineHits(QStringView *remainingInput, QList<QPair<int, int>> *hits)
{
const int hitsDelimiterPos = remainingOutput->indexOf(':');
const int hitsDelimiterPos = remainingInput->indexOf(':');
if (hitsDelimiterPos < 0)
return false;
const QStringView hitsString = remainingOutput->left(hitsDelimiterPos);
const QStringView hitsString = remainingInput->left(hitsDelimiterPos);
const QList<QStringView> hitStrings = hitsString.split(',', Qt::SkipEmptyParts);
for (const auto hitString : hitStrings) {
QPair<int, int> hit;
@@ -90,20 +90,20 @@ static bool parseLineHits(QStringView *remainingOutput, QList<QPair<int, int>> *
return false;
hits->append(hit);
}
*remainingOutput = remainingOutput->mid(hitsDelimiterPos + 1);
*remainingInput = remainingInput->mid(hitsDelimiterPos + 1);
return true;
}
SearchResultItems parse(const QString &output, const std::optional<QRegularExpression> &regExp)
SearchResultItems parse(const QString &input, const std::optional<QRegularExpression> &regExp)
{
SearchResultItems items;
QStringView remainingOutput(output);
QStringView remainingInput(input);
while (true) {
if (remainingOutput.isEmpty())
if (remainingInput.isEmpty())
break;
const QStringView filePathLine = nextLine(&remainingOutput);
const QStringView filePathLine = nextLine(&remainingInput);
if (filePathLine.isEmpty())
continue;
@@ -113,7 +113,7 @@ SearchResultItems parse(const QString &output, const std::optional<QRegularExpre
const FilePath filePath = FilePath::fromPathPart(filePathLine.mid(1));
while (true) {
QStringView hitLine = nextLine(&remainingOutput);
QStringView hitLine = nextLine(&remainingInput);
if (hitLine.isEmpty())
break;
int lineNumber = -1;