[clang-doc] clang-format

Author: PeterChou1

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

@@ -385,11 +385,11 @@ ClangDocContext::ClangDocContext(tooling::ExecutionContext *ECtx,
 }
 
 void ScopeChildren::sort() {
-  std::sort(Namespaces.begin(), Namespaces.end());
-  std::sort(Records.begin(), Records.end());
-  std::sort(Functions.begin(), Functions.end());
-  std::sort(Enums.begin(), Enums.end());
-  std::sort(Typedefs.begin(), Typedefs.end());
+  llvm::sort(Namespaces.begin(), Namespaces.end());
+  llvm::sort(Records.begin(), Records.end());
+  llvm::sort(Functions.begin(), Functions.end());
+  llvm::sort(Enums.begin(), Enums.end());
+  llvm::sort(Typedefs.begin(), Typedefs.end());
 }
 } // namespace doc
 } // namespace clang

clang-tools-extra/clang-doc/Representation.h

@@ -104,9 +104,7 @@ struct Reference {
 
   bool mergeable(const Reference &Other);
   void merge(Reference &&I);
-  bool operator<(const Reference &Other) const {
-    return llvm::toStringRef(USR) < llvm::toStringRef(Other.USR);
-  }
+  bool operator<(const Reference &Other) const { return Name < Other.Name; }
 
   /// Returns the path for this Reference relative to CurrentPath.
   llvm::SmallString<64> getRelativeFilePath(const StringRef &CurrentPath) const;
@@ -327,7 +325,7 @@ struct SymbolInfo : public Info {
     if (Loc.size() > 0 && Other.Loc.size() > 0) {
       return Loc[0] < Other.Loc[0];
     }
-    return llvm::toStringRef(USR) < llvm::toStringRef(Other.USR);
+    return extractName() < Other.extractName();
   }
 };
 

clang-tools-extra/test/clang-doc/namespace.cpp

@@ -272,14 +272,16 @@ namespace AnotherNamespace {
 // HTML-GLOBAL-INDEX: <h1>Global Namespace</h1>
 // HTML-GLOBAL-INDEX: <h2 id="Namespaces">Namespaces</h2>
 // HTML-GLOBAL-INDEX: <li>@nonymous_namespace</li>
-// HTML-GLOBAL-INDEX: <li>PrimaryNamespace</li>
 // HTML-GLOBAL-INDEX: <li>AnotherNamespace</li>
+// HTML-GLOBAL-INDEX: <li>PrimaryNamespace</li>
+
 
 // MD-GLOBAL-INDEX: # Global Namespace
 // MD-GLOBAL-INDEX: ## Namespaces
 // MD-GLOBAL-INDEX: * [@nonymous_namespace](..{{[\/]}}@nonymous_namespace{{[\/]}}index.md)
-// MD-GLOBAL-INDEX: * [PrimaryNamespace](..{{[\/]}}PrimaryNamespace{{[\/]}}index.md)
 // MD-GLOBAL-INDEX: * [AnotherNamespace](..{{[\/]}}AnotherNamespace{{[\/]}}index.md)
+// MD-GLOBAL-INDEX: * [PrimaryNamespace](..{{[\/]}}PrimaryNamespace{{[\/]}}index.md)
+
 
 // MD-ALL-FILES: # All Files
 // MD-ALL-FILES: ## [@nonymous_namespace](@nonymous_namespace{{[\/]}}index.md)