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

LanguageClient: Reimplement matchers()

Browse Source 
Change-Id: Iad31279b1563022132b5c2f971ceeb96f19a5eaf
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Jarek Kobus
2023-04-17 19:17:34 +02:00
parent 755f57d450
commit e03081a008
4 changed files with 93 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/clangcodemodel/clangdlocatorfilters.cpp
View File

@@ -162,7 +162,7 @@ ClangGlobalSymbolFilter::~ClangGlobalSymbolFilter()
LocatorMatcherTasks ClangGlobalSymbolFilter::matchers()
{
return CppEditor::cppMatchers(MatcherType::AllSymbols)
+ LanguageClient::workspaceMatchers(MatcherType::AllSymbols,
+ LanguageClient::languageClientMatchers(MatcherType::AllSymbols,
ClangModelManagerSupport::clientsForOpenProjects(), MaxResultCount);
}
@@ -191,7 +191,7 @@ ClangClassesFilter::ClangClassesFilter()
LocatorMatcherTasks ClangClassesFilter::matchers()
{
return CppEditor::cppMatchers(MatcherType::Classes)
+ LanguageClient::workspaceMatchers(MatcherType::Classes,
+ LanguageClient::languageClientMatchers(MatcherType::Classes,
ClangModelManagerSupport::clientsForOpenProjects(), MaxResultCount);
}
@@ -208,7 +208,7 @@ ClangFunctionsFilter::ClangFunctionsFilter()
LocatorMatcherTasks ClangFunctionsFilter::matchers()
{
return CppEditor::cppMatchers(MatcherType::Functions)
+ LanguageClient::workspaceMatchers(MatcherType::Functions,
+ LanguageClient::languageClientMatchers(MatcherType::Functions,
ClangModelManagerSupport::clientsForOpenProjects(), MaxResultCount);
}

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

@@ -207,16 +207,16 @@ ClangModelManagerSupport::ClangModelManagerSupport()
cppModelManager()->setFunctionsFilter(std::make_unique<ClangFunctionsFilter>());
// Setup matchers
LocatorMatcher::addMatcherCreator(MatcherType::AllSymbols, [] {
return LanguageClient::workspaceMatchers(MatcherType::AllSymbols, clientsForOpenProjects(),
10000);
return LanguageClient::languageClientMatchers(
MatcherType::AllSymbols, clientsForOpenProjects(), 10000);
});
LocatorMatcher::addMatcherCreator(MatcherType::Classes, [] {
return LanguageClient::workspaceMatchers(MatcherType::Classes, clientsForOpenProjects(),
10000);
return LanguageClient::languageClientMatchers(
MatcherType::Classes, clientsForOpenProjects(), 10000);
});
LocatorMatcher::addMatcherCreator(MatcherType::Functions, [] {
return LanguageClient::workspaceMatchers(MatcherType::Functions, clientsForOpenProjects(),
10000);
return LanguageClient::languageClientMatchers(
MatcherType::Functions, clientsForOpenProjects(), 10000);
});
EditorManager *editorManager = EditorManager::instance();