[#468] Render implicit enum/bimask values in comment style

Hide auto-generated enum/bitmask values together with comments.

Author: Mi-La

compiler/extensions/doc/freemarker/bitmask.html.ftl

@@ -37,7 +37,7 @@ ${I}    </td></tr>
     </#if>
 ${I}    <tr>
 ${I}      <td class="indent"><@symbol_reference value.symbol/></td>
-${I}      <td class="value-expression">= ${value.value}<#if value_has_next>,</#if></td>
+${I}      <td class="value-expression<#if !value.hasValueExpression> doc</#if>">= ${value.value}<#if value_has_next>,</#if></td>
 ${I}    </tr>
 ${I}  </tbody>
 </#list>

compiler/extensions/doc/freemarker/end_package.html.ftl

@@ -56,7 +56,7 @@
 
       function toggleDoc(button) {
         // find all doc rows within the button's table
-        $(button).parents("table").find("tbody tr.doc").toggle();
+        $(button).parents("table").find("tbody .doc").toggle();
         $(button).toggleClass("comments-hidden");
         let icon = $(button).find("use").attr("xlink:href");
         icon = (icon == "#chat-left") ? "#chat-left-text" : "#chat-left";

compiler/extensions/doc/freemarker/enumeration.html.ftl

@@ -37,7 +37,7 @@ ${I}    </td></tr>
     </#if>
 ${I}    <tr>
 ${I}      <td class="indent"><@symbol_reference item.symbol/></td>
-${I}      <td class="value-expression">= ${item.value}<#if item_has_next>,</#if></td>
+${I}      <td class="value-expression<#if !item.hasValueExpression> doc</#if>">= ${item.value}<#if item_has_next>,</#if></td>
 ${I}    </tr>
 ${I}  </tbody>
 </#list>

compiler/extensions/doc/freemarker/stylesheet.css.ftl

@@ -272,11 +272,12 @@ a:hover {
   max-width: ${codeIndent}rem;
 }
 
-.code td.value-expression  {
+.code td.value-expression {
   padding-left: 1rem;
 }
 
-.code div.doc {
+.code div.doc,
+.code td.value-expression.doc {
   white-space: normal;
   color: ${codeDocColor};
 }

compiler/extensions/doc/src/zserio/extension/doc/BitmaskTemplateData.java

@@ -49,8 +49,9 @@ public BitmaskValueTemplateData(PackageTemplateDataContext context, BitmaskType
 
             final ExpressionFormatter docExpressionFormatter = context.getExpressionFormatter();
             final Expression valueExpression = bitmaskValue.getValueExpression();
-            value = (valueExpression == null) ? bitmaskValue.getValue().toString() :
-                docExpressionFormatter.formatGetter(bitmaskValue.getValueExpression());
+            hasValueExpression = valueExpression != null;
+            value = hasValueExpression ? docExpressionFormatter.formatGetter(bitmaskValue.getValueExpression()) :
+                    bitmaskValue.getValue().toString();
 
             docComments = new DocCommentsTemplateData(context, bitmaskValue.getDocComments());
 
@@ -75,6 +76,11 @@ public SymbolTemplateData getSymbol()
             return symbol;
         }
 
+        public boolean getHasValueExpression()
+        {
+            return hasValueExpression;
+        }
+
         public String getValue()
         {
             return value;
@@ -91,6 +97,7 @@ public Iterable<SeeSymbolTemplateData> getSeeSymbols()
         }
 
         private final SymbolTemplateData symbol;
+        private final boolean hasValueExpression;
         private final String value;
         private final DocCommentsTemplateData docComments;
         private final List<SeeSymbolTemplateData> seeSymbols;

compiler/extensions/doc/src/zserio/extension/doc/EnumerationTemplateData.java

@@ -47,8 +47,9 @@ public EnumItemTemplateData(PackageTemplateDataContext context, EnumType enumTyp
 
             final Expression valueExpression = enumItem.getValueExpression();
             final ExpressionFormatter docExpressionFormatter = context.getExpressionFormatter();
-            value = (valueExpression == null) ? enumItem.getValue().toString() :
-                docExpressionFormatter.formatGetter(valueExpression);
+            hasValueExpression = (valueExpression != null);
+            value = hasValueExpression ? docExpressionFormatter.formatGetter(valueExpression) :
+                    enumItem.getValue().toString();
 
             docComments = new DocCommentsTemplateData(context, enumItem.getDocComments());
 
@@ -73,6 +74,11 @@ public SymbolTemplateData getSymbol()
             return symbol;
         }
 
+        public boolean getHasValueExpression()
+        {
+            return hasValueExpression;
+        }
+
         public String getValue()
         {
             return value;
@@ -89,6 +95,7 @@ public Iterable<SeeSymbolTemplateData> getSeeSymbols()
         }
 
         private final SymbolTemplateData symbol;
+        private final boolean hasValueExpression;
         private final String value;
         private final DocCommentsTemplateData docComments;
         private final List<SeeSymbolTemplateData> seeSymbols;