From bf68cda03d8efc697aedb13e75d0511fe5297f2b Mon Sep 17 00:00:00 2001 From: vladmos Date: Wed, 1 Aug 2018 09:42:55 -0700 Subject: Fix a broken link in the documentation Fixes #5601 PiperOrigin-RevId: 206942639 --- .../com/google/devtools/build/docgen/SkylarkDocumentationProcessor.java | 2 ++ .../java/com/google/devtools/build/docgen/skylark/SkylarkDocUtils.java | 2 +- .../java/com/google/devtools/build/docgen/templates/skylark-category.vm | 2 +- 3 files changed, 4 insertions(+), 2 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 deed2ce679..a8c7c68948 100644 --- a/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationProcessor.java +++ b/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationProcessor.java @@ -14,6 +14,7 @@ package com.google.devtools.build.docgen; import com.google.common.collect.ImmutableList; +import com.google.devtools.build.docgen.skylark.SkylarkDocUtils; import com.google.devtools.build.docgen.skylark.SkylarkMethodDoc; import com.google.devtools.build.docgen.skylark.SkylarkModuleDoc; import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; @@ -138,6 +139,7 @@ public final class SkylarkDocumentationProcessor { Page page = TemplateEngine.newPage(DocgenConsts.SKYLARK_MODULE_CATEGORY_TEMPLATE); page.add("category", category); page.add("modules", modules.get(category)); + page.add("description", SkylarkDocUtils.substituteVariables(category.getDescription())); page.write(skylarkDocPath); } diff --git a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkDocUtils.java b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkDocUtils.java index 18300683af..27f66a52ef 100644 --- a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkDocUtils.java +++ b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkDocUtils.java @@ -27,7 +27,7 @@ public final class SkylarkDocUtils { * * @return a string with substituted variables */ - static String substituteVariables(String documentation) { + public static String substituteVariables(String documentation) { return documentation .replace("$BE_ROOT", DocgenConsts.BeDocsRoot) .replace("$DOC_EXT", DocgenConsts.documentationExtension); diff --git a/src/main/java/com/google/devtools/build/docgen/templates/skylark-category.vm b/src/main/java/com/google/devtools/build/docgen/templates/skylark-category.vm index 64646d4dd4..ae302f3d1f 100644 --- a/src/main/java/com/google/devtools/build/docgen/templates/skylark-category.vm +++ b/src/main/java/com/google/devtools/build/docgen/templates/skylark-category.vm @@ -4,7 +4,7 @@ title: ${category.title} ---

${category.title}

-${category.description} +${description}