This is an archive of the discontinued LLVM Phabricator instance.

Differential D65827

[clang-doc] Fix paths of js in import tags
ClosedPublic

Authored by DiegoAstiazaran on Aug 6 2019, 1:54 PM.

Details

Reviewers
juliehockett
Commits
rG40fde9019327: [clang-doc] Fix paths of js in import tags
rL368087: [clang-doc] Fix paths of js in import tags
rCTE368087: [clang-doc] Fix paths of js in import tags
Summary

HTML requires posix-style paths.

Diff Detail

Event Timeline

DiegoAstiazaran created this revision.Aug 6 2019, 1:54 PM
juliehockett accepted this revision.Aug 6 2019, 1:56 PM

LGTM (let's make sure we double check this next time)

This revision is now accepted and ready to land.Aug 6 2019, 1:56 PM
Closed by commit rL368087: [clang-doc] Fix paths of js in import tags (authored by DiegoAstiazaran). · Explain WhyAug 6 2019, 2:00 PM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptAug 6 2019, 2:00 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
clang-tools-extra/
clang-doc/
2 lines

Diff 213710

clang-tools-extra/clang-doc/HTMLGenerator.cpp

Show First 20 Lines • Show All 250 Lines • ▼ Show 20 Lines
static std::vector<std::unique_ptr<TagNode>> static std::vector<std::unique_ptr<TagNode>>
genJsScriptsHTML(StringRef InfoPath, const ClangDocContext &CDCtx) { genJsScriptsHTML(StringRef InfoPath, const ClangDocContext &CDCtx) {
std::vector<std::unique_ptr<TagNode>> Out; std::vector<std::unique_ptr<TagNode>> Out;
for (const auto &FilePath : CDCtx.JsScripts) { for (const auto &FilePath : CDCtx.JsScripts) {
auto ScriptNode = llvm::make_unique<TagNode>(HTMLTag::TAG_SCRIPT); auto ScriptNode = llvm::make_unique<TagNode>(HTMLTag::TAG_SCRIPT);
SmallString<128> ScriptPath = computeRelativePath("", InfoPath); SmallString<128> ScriptPath = computeRelativePath("", InfoPath);
llvm::sys::path::append(ScriptPath, llvm::sys::path::filename(FilePath)); llvm::sys::path::append(ScriptPath, llvm::sys::path::filename(FilePath));
// Paths in HTML must be in posix-style
llvm::sys::path::native(ScriptPath, llvm::sys::path::Style::posix);
ScriptNode->Attributes.try_emplace("src", ScriptPath); ScriptNode->Attributes.try_emplace("src", ScriptPath);
Out.emplace_back(std::move(ScriptNode)); Out.emplace_back(std::move(ScriptNode));
} }
return Out; return Out;
} }
static std::unique_ptr<TagNode> genLink(const Twine &Text, const Twine &Link) { static std::unique_ptr<TagNode> genLink(const Twine &Text, const Twine &Link) {
auto LinkNode = llvm::make_unique<TagNode>(HTMLTag::TAG_A, Text); auto LinkNode = llvm::make_unique<TagNode>(HTMLTag::TAG_A, Text);
▲ Show 20 Lines • Show All 465 Lines • Show Last 20 Lines