diff options
| author | Diego Astiazaran <diegoaat97@gmail.com> | 2019-07-26 18:02:42 +0000 |
|---|---|---|
| committer | Diego Astiazaran <diegoaat97@gmail.com> | 2019-07-26 18:02:42 +0000 |
| commit | d6cdd98a25b85a4c14a79542f5b832b21fc5592a (patch) | |
| tree | 1a7599f373b05269f1fa23fa8774409485b50d17 | |
| parent | 51dcb292cc002ad6ec88d7d929a96407c0685066 (diff) | |
| download | bcm5719-llvm-d6cdd98a25b85a4c14a79542f5b832b21fc5592a.tar.gz bcm5719-llvm-d6cdd98a25b85a4c14a79542f5b832b21fc5592a.zip | |
[clang-format] Fix style of css file paths
CSS files included in HTML should have a path in posix style, it should
not be different for Windows.
Differential Revision: https://reviews.llvm.org/D65309
llvm-svn: 367137
| -rw-r--r-- | clang-tools-extra/clang-doc/HTMLGenerator.cpp | 2 | ||||
| -rw-r--r-- | clang-tools-extra/unittests/clang-doc/HTMLGeneratorTest.cpp | 17 |
2 files changed, 5 insertions, 14 deletions
diff --git a/clang-tools-extra/clang-doc/HTMLGenerator.cpp b/clang-tools-extra/clang-doc/HTMLGenerator.cpp index 56ed9769a18..50660ffa268 100644 --- a/clang-tools-extra/clang-doc/HTMLGenerator.cpp +++ b/clang-tools-extra/clang-doc/HTMLGenerator.cpp @@ -231,6 +231,8 @@ genStylesheetsHTML(StringRef InfoPath, const ClangDocContext &CDCtx) { SmallString<128> StylesheetPath = computeRelativePath("", InfoPath); llvm::sys::path::append(StylesheetPath, llvm::sys::path::filename(FilePath)); + // Paths in HTML must be in posix-style + llvm::sys::path::native(StylesheetPath, llvm::sys::path::Style::posix); LinkNode->Attributes.try_emplace("href", StylesheetPath); Out.emplace_back(std::move(LinkNode)); } diff --git a/clang-tools-extra/unittests/clang-doc/HTMLGeneratorTest.cpp b/clang-tools-extra/unittests/clang-doc/HTMLGeneratorTest.cpp index 81fcdb1daa3..454ab7d4bfc 100644 --- a/clang-tools-extra/unittests/clang-doc/HTMLGeneratorTest.cpp +++ b/clang-tools-extra/unittests/clang-doc/HTMLGeneratorTest.cpp @@ -110,34 +110,23 @@ TEST(HTMLGeneratorTest, emitRecordHTML) { ClangDocContext CDCtx = getClangDocContext(); auto Err = G->generateDocForInfo(&I, Actual, CDCtx); assert(!Err); - SmallString<16> PathToF; - llvm::sys::path::native("../../../path/to/F.html", PathToF); - SmallString<16> PathToInt; - llvm::sys::path::native("../int.html", PathToInt); - SmallString<16> PathToSylesheet; - llvm::sys::path::native("../../../clang-doc-default-stylesheet.css", - PathToSylesheet); std::string Expected = R"raw(<!DOCTYPE html> <meta charset="utf-8"/> <title>class r</title> -<link rel="stylesheet" href=")raw" + - std::string(PathToSylesheet.str()) + - R"raw("/> +<link rel="stylesheet" href="../../../clang-doc-default-stylesheet.css"/> <div> <h1>class r</h1> <p>Defined at line 10 of test.cpp</p> <p> Inherits from - <a href=")raw" + std::string(PathToF.str()) + - R"raw(">F</a> + <a href="../../../path/to/F.html">F</a> , G </p> <h2>Members</h2> <ul> <li> private - <a href=")raw" + std::string(PathToInt.str()) + - R"raw(">int</a> + <a href="../int.html">int</a> X </li> </ul> |
