Skip to content

[clang-doc] Add Mustache case to test for DR 131697 #170197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 4, 2025
+16 −9
Merged

[clang-doc] Add Mustache case to test for DR 131697 #170197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions clang-tools-extra/clang-doc/Generators.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,27 +84,33 @@ Error MustacheGenerator::generateDocumentation(
return JSONGenerator.takeError();
}

SmallString<128> JSONPath;
sys::path::native(RootDir.str() + "/json", JSONPath);
SmallString<128> JSONDirPath(RootDir);
SmallString<128> DocsDirPath(RootDir);
{
TimeTraceScope TS("Create Output Directories");
sys::path::append(JSONDirPath, "json");
if (auto EC = sys::fs::create_directories(JSONDirPath))
return createFileError(JSONDirPath, EC);
sys::path::append(DocsDirPath, DirName);
if (auto EC = sys::fs::create_directories(DocsDirPath))
return createFileError(DocsDirPath, EC);
}

{
llvm::TimeTraceScope TS("Iterate JSON files");
std::error_code EC;
sys::fs::recursive_directory_iterator JSONIter(JSONPath, EC);
sys::fs::recursive_directory_iterator JSONIter(JSONDirPath, EC);
std::vector<json::Value> JSONFiles;
JSONFiles.reserve(Infos.size());
if (EC)
return createStringError("Failed to create directory iterator.");

SmallString<128> DocsDirPath(RootDir.str() + '/' + DirName);
sys::path::native(DocsDirPath);
if (auto EC = sys::fs::create_directories(DocsDirPath))
return createFileError(DocsDirPath, EC);
while (JSONIter != sys::fs::recursive_directory_iterator()) {
// create the same directory structure in the docs format dir
if (JSONIter->type() == sys::fs::file_type::directory_file) {
SmallString<128> DocsClonedPath(JSONIter->path());
sys::path::replace_path_prefix(DocsClonedPath, JSONPath, DocsDirPath);
sys::path::replace_path_prefix(DocsClonedPath, JSONDirPath,
DocsDirPath);
if (auto EC = sys::fs::create_directories(DocsClonedPath)) {
return createFileError(DocsClonedPath, EC);
}
Expand Down Expand Up @@ -134,7 +140,7 @@ Error MustacheGenerator::generateDocumentation(

std::error_code FileErr;
SmallString<128> DocsFilePath(JSONIter->path());
sys::path::replace_path_prefix(DocsFilePath, JSONPath, DocsDirPath);
sys::path::replace_path_prefix(DocsFilePath, JSONDirPath, DocsDirPath);
sys::path::replace_extension(DocsFilePath, DirName);
raw_fd_ostream InfoOS(DocsFilePath, FileErr, sys::fs::OF_None);
if (FileErr)
Expand Down
1 change: 1 addition & 0 deletions clang-tools-extra/test/clang-doc/DR-131697.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// RUN: rm -rf %t && mkdir -p %t
// RUN: split-file %s %t
// RUN: clang-doc -format=html %t/compile_commands.json %t/main.cpp
// RUN: clang-doc -format=mustache %t/compile_commands.json %t/main.cpp

//--- main.cpp

Expand Down
Loading