Skip to content

Commit facbe53

Browse files
committed
[clangd] [Modules] Support Reusable Modules Builder
1 parent d68059b commit facbe53

File tree

6 files changed

+367
-90
lines changed

6 files changed

+367
-90
lines changed

clang-tools-extra/clangd/ClangdLSPServer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,8 @@ void ClangdLSPServer::onInitialize(const InitializeParams &Params,
567567
std::move(Mangler));
568568

569569
if (Opts.EnableExperimentalModulesSupport) {
570-
ModulesManager.emplace(*CDB);
571-
Opts.ModulesManager = &*ModulesManager;
570+
ModulesManager = ModulesBuilder::getModulesBuilder(*CDB);
571+
Opts.ModulesManager = ModulesManager.get();
572572
}
573573

574574
{

clang-tools-extra/clangd/ClangdLSPServer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ class ClangdLSPServer : private ClangdServer::Callbacks,
327327
// The ClangdServer is created by the "initialize" LSP method.
328328
std::optional<ClangdServer> Server;
329329
// Manages to build module files.
330-
std::optional<ModulesBuilder> ModulesManager;
330+
std::unique_ptr<ModulesBuilder> ModulesManager;
331331
};
332332
} // namespace clangd
333333
} // namespace clang

0 commit comments

Comments
 (0)