[clang-doc] Don't serialize non-existant locations in HTML

[evelez7]

The function template didn't check to see if a Location existed before
emitting the definition location line.

[evelez7]

• [clang-doc] Add variables to the namespace HTML template #175226
• [clang-doc] Serialize repository URL in Mustache templates #174914
• [clang-doc] Don't serialize non-existant locations in HTML #174887 👈 (View in Graphite)
• [clang-doc] Add protected methods to class template #174884
• [clang-doc] Add protected members to class template #174883
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[llvmbot]

@llvm/pr-subscribers-clang-tools-extra

Author: Erick Velez (evelez7)

Changes

The function template didn't check to see if a Location existed before
emitting the definition location line.

---

Full diff: https://github.com/llvm/llvm-project/pull/174887.diff

3 Files Affected:

• (modified) clang-tools-extra/clang-doc/assets/function-template.mustache (+3-1)
• (modified) clang-tools-extra/test/clang-doc/json/class.cpp (-1)
• (modified) clang-tools-extra/test/clang-doc/templates.cpp (-2)

diff --git a/clang-tools-extra/clang-doc/assets/function-template.mustache b/clang-tools-extra/clang-doc/assets/function-template.mustache
index 1e81f34196137..354e26b7b05b0 100644
--- a/clang-tools-extra/clang-doc/assets/function-template.mustache
+++ b/clang-tools-extra/clang-doc/assets/function-template.mustache
@@ -17,5 +17,7 @@
             {{>Comments}}
         </div>
         {{/Description}}
-        <p>Defined at line {{Location.LineNumber}} of file {{Location.Filename}}</p>
+        {{#Location}}
+        <p>Defined at line {{LineNumber}} of file {{Filename}}</p>
+        {{/Location}}
 </div>
diff --git a/clang-tools-extra/test/clang-doc/json/class.cpp b/clang-tools-extra/test/clang-doc/json/class.cpp
index 5c63aa5ec45ef..c4f0b2166a3f8 100644
--- a/clang-tools-extra/test/clang-doc/json/class.cpp
+++ b/clang-tools-extra/test/clang-doc/json/class.cpp
@@ -335,7 +335,6 @@ struct MyClass {
 // HTML-NEXT:     <div>
 // HTML-NEXT:         <div id="{{([0-9A-F]{40})}}" class="delimiter-container">
 // HTML-NEXT:                 <pre><code class="language-cpp code-clang-doc">int protectedMethod ()</code></pre>
-// HTML-NEXT:                 <p>Defined at line  of file </p>
 // HTML-NEXT:         </div>
 // HTML-NEXT:     </div>
 // HTML-NEXT: </section>
diff --git a/clang-tools-extra/test/clang-doc/templates.cpp b/clang-tools-extra/test/clang-doc/templates.cpp
index c9f1370a19e6e..27fff6ed5a09d 100644
--- a/clang-tools-extra/test/clang-doc/templates.cpp
+++ b/clang-tools-extra/test/clang-doc/templates.cpp
@@ -79,8 +79,6 @@ void ParamPackFunction(T... args);
 
 // HTML:        <pre><code class="language-cpp code-clang-doc">template &lt;class... T&gt;</code></pre>
 // HTML-NEXT:      <pre><code class="language-cpp code-clang-doc">void ParamPackFunction (T... args)</code></pre>
-// COM:            FIXME: Omit defined line if not defined, or emit declaration line.
-// HTML-NEXT:      <p>Defined at line of file </p>
 // HTML-NEXT:  </div>
 
 template <typename T, int U = 1>

[evelez7]

HTML preview: https://erickvelez.com/clang-doc-mustache-output/pr174887/GlobalNamespace/_ZTV7MyClass.html

Before: https://erickvelez.com/clang-doc-mustache-output/pr174884/GlobalNamespace/_ZTV7MyClass.html

[evelez7]

Merge activity

• Jan 9, 1:27 AM UTC: A user started a stack merge that includes this pull request via Graphite.
• Jan 9, 1:29 AM UTC: @evelez7 merged this pull request with Graphite.