diff options
author | Laszlo Csomor <laszlocsomor@google.com> | 2015-03-13 10:50:10 +0000 |
---|---|---|
committer | Han-Wen Nienhuys <hanwen@google.com> | 2015-03-13 14:42:10 +0000 |
commit | 4a11c3af36552898da74303721f6998d00556fea (patch) | |
tree | 38e4a7d3b6064668de3aee97234fee5472df2b1a /src/main/java/com/google/devtools/build/docgen/BuildEncyclopediaProcessor.java | |
parent | 0765237fcae9c14ff5af61861e39f8a9529e11a3 (diff) |
Fix Build Encyclopedia docgen: allow overriding rule definitions.
This is important if a base rule definition is available but the specific rule
class wants to override it.
--
MOS_MIGRATED_REVID=88533474
Diffstat (limited to 'src/main/java/com/google/devtools/build/docgen/BuildEncyclopediaProcessor.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/docgen/BuildEncyclopediaProcessor.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/docgen/BuildEncyclopediaProcessor.java b/src/main/java/com/google/devtools/build/docgen/BuildEncyclopediaProcessor.java index baf3399443..009e78c2e5 100644 --- a/src/main/java/com/google/devtools/build/docgen/BuildEncyclopediaProcessor.java +++ b/src/main/java/com/google/devtools/build/docgen/BuildEncyclopediaProcessor.java @@ -410,12 +410,11 @@ public class BuildEncyclopediaProcessor { String ruleName = d.getRuleName(); if (ruleDocEntries.containsKey(ruleName) && !ruleClassFiles.get(ruleName).equals(inputPath)) { - System.err.printf("WARNING: '%s' from '%s' already in map from '%s', skipping\n", + System.err.printf("WARNING: '%s' from '%s' overrides value already in map from '%s'\n", d.getRuleName(), inputPath, ruleClassFiles.get(ruleName)); - } else { - ruleClassFiles.put(ruleName, inputPath); - ruleDocEntries.put(ruleName, d); } + ruleClassFiles.put(ruleName, inputPath); + ruleDocEntries.put(ruleName, d); } if (attributeDocEntries != null) { // Collect all attribute documentations from this file. |