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

SearchResultItem: Introduce SearchResultItems

Browse Source 
And reuse it.

Change-Id: Ia052297340f2bf2478fbfdb2427b45e30bd9d067
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2023-05-05 19:12:47 +02:00
parent 8b3aa900da
commit c879aeb565
25 changed files with 73 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangdclient.h
View File

@@ -119,7 +119,7 @@ public:
signals:
void indexingFinished();
void foundReferences(const QList<Utils::SearchResultItem> &items);
void foundReferences(const Utils::SearchResultItems &items);
void findUsagesDone();
void helpItemGathered(const Core::HelpItem &helpItem);
void highlightingResultsReady(const TextEditor::HighlightingResults &results,

12
src/plugins/clangcodemodel/clangdfindreferences.cpp
View File

@@ -72,7 +72,7 @@ public:
const Position linkAsPosition;
const QPointer<SearchResult> search;
const LinkHandler callback;
QList<SearchResultItem> declDefItems;
SearchResultItems declDefItems;
bool openedExtraFileForLink = false;
bool declHasUsedTag = false;
bool recursiveCallDetected = false;
@@ -89,7 +89,7 @@ public:
const SearchResult *search,
const ReplacementData &replacementData,
const QString &newSymbolName,
const QList<SearchResultItem> &checkedItems,
const SearchResultItems &checkedItems,
bool preserveCase);
void handleFindUsagesResult(const QList<Location> &locations);
void finishSearch();
@@ -143,7 +143,7 @@ ClangdFindReferences::ClangdFindReferences(ClangdClient *client, TextDocument *d
d->search->setAdditionalReplaceWidget(renameFilesCheckBox);
const auto renameHandler =
[search = d->search](const QString &newSymbolName,
const QList<SearchResultItem> &checkedItems,
const SearchResultItems &checkedItems,
bool preserveCase) {
const auto replacementData = search->userData().value<ReplacementData>();
Private::handleRenameRequest(search, replacementData, newSymbolName, checkedItems,
@@ -151,7 +151,7 @@ ClangdFindReferences::ClangdFindReferences(ClangdClient *client, TextDocument *d
};
connect(d->search, &SearchResult::replaceButtonClicked, renameHandler);
}
connect(d->search, &SearchResult::activated, [](const SearchResultItem& item) {
connect(d->search, &SearchResult::activated, [](const SearchResultItem &item) {
EditorManager::openEditorAtSearchResult(item);
});
if (d->search->isInteractive())
@@ -243,7 +243,7 @@ void ClangdFindReferences::Private::handleRenameRequest(
const SearchResult *search,
const ReplacementData &replacementData,
const QString &newSymbolName,
const QList<SearchResultItem> &checkedItems,
const SearchResultItems &checkedItems,
bool preserveCase)
{
const Utils::FilePaths filePaths = BaseFileFind::replaceAll(newSymbolName, checkedItems,
@@ -391,7 +391,7 @@ static Usage::Tags getUsageType(const ClangdAstPath &path, const QString &search
void ClangdFindReferences::Private::addSearchResultsForFile(const FilePath &file,
const ReferencesFileData &fileData)
{
QList<SearchResultItem> items;
SearchResultItems items;
qCDebug(clangdLog) << file << "has valid AST:" << fileData.ast.isValid();
const auto expectedDeclTypes = [this]() -> QStringList {
if (checkUnusedData)

2
src/plugins/clangcodemodel/clangdfindreferences.h
View File

@@ -35,7 +35,7 @@ public:
~ClangdFindReferences();
signals:
void foundReferences(const QList<Utils::SearchResultItem> &items);
void foundReferences(const Utils::SearchResultItems &items);
void done();
private:

33
src/plugins/clangcodemodel/test/clangdtests.cpp
View File

@@ -191,7 +191,7 @@ void ClangdTestFindReferences::initTestCase()
ClangdTest::initTestCase();
CppEditor::codeModelSettings()->setCategorizeFindReferences(true);
connect(client(), &ClangdClient::foundReferences, this,
[this](const QList<SearchResultItem> &results) {
[this](const SearchResultItems &results) {
if (results.isEmpty())
return;
if (results.first().path().first().endsWith("defs.h"))
@@ -205,8 +205,7 @@ void ClangdTestFindReferences::test_data()
{
QTest::addColumn<QString>("fileName");
QTest::addColumn<int>("pos");
using ItemList = QList<SearchResultItem>;
QTest::addColumn<ItemList>("expectedResults");
QTest::addColumn<SearchResultItems>("expectedResults");
static const auto makeItem = [](int line, int column, Usage::Tags tags) {
SearchResultItem item;
@@ -215,7 +214,7 @@ void ClangdTestFindReferences::test_data()
return item;
};
QTest::newRow("struct member") << "defs.h" << 55 << ItemList{
QTest::newRow("struct member") << "defs.h" << 55 << SearchResultItems{
makeItem(2, 17, Usage::Tag::Read), makeItem(3, 15, Usage::Tag::Declaration),
makeItem(6, 17, Usage::Tag::WritableRef), makeItem(8, 11, Usage::Tag::WritableRef),
makeItem(9, 13, Usage::Tag::WritableRef), makeItem(10, 12, Usage::Tag::WritableRef),
@@ -232,23 +231,23 @@ void ClangdTestFindReferences::test_data()
makeItem(56, 7, Usage::Tag::Write), makeItem(56, 25, Usage::Tags()),
makeItem(58, 13, Usage::Tag::Read), makeItem(58, 25, Usage::Tag::Read),
makeItem(59, 7, Usage::Tag::Write), makeItem(59, 24, Usage::Tag::Read)};
QTest::newRow("constructor member initialization") << "defs.h" << 68 << ItemList{
QTest::newRow("constructor member initialization") << "defs.h" << 68 << SearchResultItems{
makeItem(2, 10, Usage::Tag::Write), makeItem(4, 8, Usage::Tag::Declaration)};
QTest::newRow("direct member initialization") << "defs.h" << 101 << ItemList{
QTest::newRow("direct member initialization") << "defs.h" << 101 << SearchResultItems{
makeItem(5, 21, Initialization), makeItem(45, 16, Usage::Tag::Read)};
ItemList pureVirtualRefs{makeItem(17, 17, Usage::Tag::Declaration),
SearchResultItems pureVirtualRefs{makeItem(17, 17, Usage::Tag::Declaration),
makeItem(21, 9, {Usage::Tag::Declaration, Usage::Tag::Override})};
QTest::newRow("pure virtual declaration") << "defs.h" << 420 << pureVirtualRefs;
QTest::newRow("pointer variable") << "main.cpp" << 52 << ItemList{
QTest::newRow("pointer variable") << "main.cpp" << 52 << SearchResultItems{
makeItem(6, 10, Initialization), makeItem(8, 4, Usage::Tag::Write),
makeItem(10, 4, Usage::Tag::Write), makeItem(24, 5, Usage::Tag::Write),
makeItem(25, 11, Usage::Tag::WritableRef), makeItem(26, 11, Usage::Tag::Read),
makeItem(27, 10, Usage::Tag::WritableRef), makeItem(28, 10, Usage::Tag::Read),
makeItem(29, 11, Usage::Tag::Read), makeItem(30, 15, Usage::Tag::WritableRef),
makeItem(31, 22, Usage::Tag::Read)};
QTest::newRow("struct variable") << "main.cpp" << 39 << ItemList{
QTest::newRow("struct variable") << "main.cpp" << 39 << SearchResultItems{
makeItem(5, 7, Usage::Tag::Declaration), makeItem(6, 15, Usage::Tag::WritableRef),
makeItem(8, 9, Usage::Tag::WritableRef), makeItem(9, 11, Usage::Tag::WritableRef),
makeItem(11, 4, Usage::Tag::Write), makeItem(11, 11, Usage::Tag::WritableRef),
@@ -269,7 +268,7 @@ void ClangdTestFindReferences::test_data()
// Some of these are conceptually questionable, as S is a type and thus we cannot "read from"
// or "write to" it. But it probably matches the intuitive user expectation.
QTest::newRow("struct type") << "defs.h" << 7 << ItemList{
QTest::newRow("struct type") << "defs.h" << 7 << SearchResultItems{
makeItem(1, 7, Usage::Tag::Declaration),
makeItem(2, 4, (Usage::Tags{Usage::Tag::Declaration, Usage::Tag::ConstructorDestructor})),
makeItem(20, 19, Usage::Tags()), makeItem(10, 9, Usage::Tag::WritableRef),
@@ -281,24 +280,24 @@ void ClangdTestFindReferences::test_data()
makeItem(58, 10, Usage::Tag::Read), makeItem(58, 22, Usage::Tag::Read),
makeItem(59, 4, Usage::Tag::Write), makeItem(59, 21, Usage::Tag::Read)};
QTest::newRow("struct type 2") << "defs.h" << 450 << ItemList{
QTest::newRow("struct type 2") << "defs.h" << 450 << SearchResultItems{
makeItem(20, 7, Usage::Tag::Declaration), makeItem(5, 4, Usage::Tags()),
makeItem(13, 21, Usage::Tags()), makeItem(32, 8, Usage::Tags())};
QTest::newRow("constructor") << "defs.h" << 627 << ItemList{
QTest::newRow("constructor") << "defs.h" << 627 << SearchResultItems{
makeItem(31, 4, (Usage::Tags{Usage::Tag::Declaration, Usage::Tag::ConstructorDestructor})),
makeItem(36, 7, Usage::Tag::ConstructorDestructor)};
QTest::newRow("subclass") << "defs.h" << 450 << ItemList{
QTest::newRow("subclass") << "defs.h" << 450 << SearchResultItems{
makeItem(20, 7, Usage::Tag::Declaration), makeItem(5, 4, Usage::Tags()),
makeItem(13, 21, Usage::Tags()), makeItem(32, 8, Usage::Tags())};
QTest::newRow("array variable") << "main.cpp" << 1134 << ItemList{
QTest::newRow("array variable") << "main.cpp" << 1134 << SearchResultItems{
makeItem(57, 8, Usage::Tag::Declaration), makeItem(58, 4, Usage::Tag::Write),
makeItem(59, 15, Usage::Tag::Read)};
QTest::newRow("free function") << "defs.h" << 510 << ItemList{
QTest::newRow("free function") << "defs.h" << 510 << SearchResultItems{
makeItem(24, 5, Usage::Tag::Declaration), makeItem(19, 4, Usage::Tags()),
makeItem(25, 4, Usage::Tags()), makeItem(60, 26, Usage::Tag::Read)};
QTest::newRow("member function") << "defs.h" << 192 << ItemList{
QTest::newRow("member function") << "defs.h" << 192 << SearchResultItems{
makeItem(9, 12, Usage::Tag::Declaration), makeItem(40, 8, Usage::Tags())};
}
@@ -309,7 +308,7 @@ void ClangdTestFindReferences::test()
{
QFETCH(QString, fileName);
QFETCH(int, pos);
QFETCH(QList<SearchResultItem>, expectedResults);
QFETCH(SearchResultItems, expectedResults);
TextEditor::TextDocument * const doc = document(fileName);
QVERIFY(doc);

2
src/plugins/clangcodemodel/test/clangdtests.h
View File

@@ -74,7 +74,7 @@ private slots:
void test();
private:
QList<Utils::SearchResultItem> m_actualResults;
Utils::SearchResultItems m_actualResults;
};
class ClangdTestFollowSymbol : public ClangdTest