diff options
Diffstat (limited to 'src/main/java/com')
-rw-r--r-- | src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationProcessor.java | 8 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/docgen/skylark/SkylarkModuleDoc.java | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationProcessor.java b/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationProcessor.java index f0f297633f..8cd0e17761 100644 --- a/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationProcessor.java +++ b/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationProcessor.java @@ -22,10 +22,12 @@ import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; import com.google.devtools.build.lib.util.Classpath.ClassPathException; import java.io.File; import java.io.IOException; +import java.text.Collator; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; /** A class to assemble documentation for Skylark. */ @@ -60,6 +62,10 @@ public final class SkylarkDocumentationProcessor { modulesByCategory.get(module.getAnnotation().category()).add(module); } } + Collator us = Collator.getInstance(Locale.US); + for (List<SkylarkModuleDoc> module : modulesByCategory.values()) { + Collections.sort(module, (doc1, doc2) -> us.compare(doc1.getTitle(), doc2.getTitle())); + } writeCategoryPage(SkylarkModuleCategory.CONFIGURATION_FRAGMENT, outputDir, modulesByCategory); writeCategoryPage(SkylarkModuleCategory.BUILTIN, outputDir, modulesByCategory); writeCategoryPage(SkylarkModuleCategory.PROVIDER, outputDir, modulesByCategory); @@ -91,7 +97,7 @@ public final class SkylarkDocumentationProcessor { } } - Collections.sort(globalModules); + Collections.sort(globalModules, us); writeOverviewPage( outputDir, globalModule.getName(), globalFunctions, globalModules, modulesByCategory); } diff --git a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkModuleDoc.java b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkModuleDoc.java index 26b787082f..3929c4aeb7 100644 --- a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkModuleDoc.java +++ b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkModuleDoc.java @@ -20,7 +20,9 @@ import com.google.common.collect.Multimap; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.skylarkinterface.SkylarkSignature; +import java.text.Collator; import java.util.Collection; +import java.util.Locale; import java.util.Map; import java.util.TreeMap; @@ -40,8 +42,8 @@ public final class SkylarkModuleDoc extends SkylarkDoc { this.module = Preconditions.checkNotNull( module, "Class has to be annotated with SkylarkModule: %s", classObject); this.classObject = classObject; - this.builtinMethodMap = new TreeMap<>(); - this.methodMap = new TreeMap<>(); + this.builtinMethodMap = new TreeMap<>(Collator.getInstance(Locale.US)); + this.methodMap = new TreeMap<>(Collator.getInstance(Locale.US)); this.javaMethods = HashMultimap.<String, SkylarkJavaMethodDoc>create(); if (module.title().isEmpty()) { this.title = module.name(); |