diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/docgen/ApiExporter.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/docgen/ApiExporter.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/docgen/ApiExporter.java b/src/main/java/com/google/devtools/build/docgen/ApiExporter.java index b65f11b771..a0124d251d 100644 --- a/src/main/java/com/google/devtools/build/docgen/ApiExporter.java +++ b/src/main/java/com/google/devtools/build/docgen/ApiExporter.java @@ -18,7 +18,6 @@ import com.google.devtools.build.docgen.builtin.BuiltinProtos.Callable; import com.google.devtools.build.docgen.builtin.BuiltinProtos.Param; import com.google.devtools.build.docgen.builtin.BuiltinProtos.Type; import com.google.devtools.build.docgen.builtin.BuiltinProtos.Value; -import com.google.devtools.build.docgen.skylark.SkylarkBuiltinMethodDoc; import com.google.devtools.build.docgen.skylark.SkylarkMethodDoc; import com.google.devtools.build.docgen.skylark.SkylarkModuleDoc; import com.google.devtools.build.docgen.skylark.SkylarkParamDoc; @@ -36,6 +35,13 @@ public class ApiExporter { Builtins.Builder builtins = Builtins.newBuilder(); Map<String, SkylarkModuleDoc> allTypes = SkylarkDocumentationCollector.collectModules(); + + // Add all global variables and functions in Builtins as Values. + SkylarkModuleDoc topLevelModule = + allTypes.remove(SkylarkDocumentationCollector.getTopLevelModule().name()); + for (SkylarkMethodDoc meth : topLevelModule.getMethods()) { + builtins.addGlobal(collectFieldInfo(meth)); + } for (Map.Entry<String, SkylarkModuleDoc> modEntry : allTypes.entrySet()) { SkylarkModuleDoc mod = modEntry.getValue(); @@ -54,13 +60,6 @@ public class ApiExporter { value.setType(mod.getName()); value.setDoc(mod.getDocumentation()); builtins.addGlobal(value); - - // Add all global variables and functions in Builtins as Values. - for (Map.Entry<String, SkylarkBuiltinMethodDoc> methEntry : - mod.getBuiltinMethods().entrySet()) { - SkylarkBuiltinMethodDoc meth = methEntry.getValue(); - builtins.addGlobal(collectFieldInfo(meth)); - } } Builtins build = builtins.build(); build.writeTo(out); |