update doctlet to support static fields

Author: mikebarkmin

docs/templates/class.md.hbs

@@ -40,3 +40,13 @@ hide: true
 {{/each}}
 {{/if}}
 
+{{#if fields}}
+## Static Fields
+
+| Name | Type | Description |
+|------|------|-------------|
+{{#each fields}}
+| `{{ name }}` | {{ type }} | {{ description }} |
+{{/each}}
+{{/if}}
+

src/main/java/org/openpatch/scratch/KeyCode.java

@@ -30,6 +30,7 @@
  *
  * <p>The constants in this class are intended to be used for keyboard event handling and key
  * mapping operations.
+ * 
  */
 public final class KeyCode {
   /* Virtual key codes. */

src/tools/java/doclets/Scratch4JDoclet.java

@@ -225,7 +225,7 @@ private void generatePackageIndex(String packageName, List<TypeElement> classes,
                 }
             }
         }
-        json.put("description", convertToMarkdown(description, packageName).trim());
+        json.put("description", convertToMarkdown(description, packageName).replace("\n", " ").replace("\r", " ").trim());
         if (indexInDocs != null) {
             json.put("index", indexInDocs);
         }
@@ -320,7 +320,7 @@ private void generateClassIndex(TypeElement classElement, List<ExecutableElement
         }
 
         json.put("scratchblock", customTags.getOrDefault("scratchblock", ""));
-        json.put("description", convertToMarkdown(description, currentPackage).trim());
+        json.put("description", convertToMarkdown(description, currentPackage).replace("\n", " ").replace("\r", " ").trim());
         if (indexInDocs != null) {
             json.put("index", indexInDocs);
         }
@@ -335,6 +335,31 @@ private void generateClassIndex(TypeElement classElement, List<ExecutableElement
         // Examples - support multiple examples
         json.put("examples", buildExamples(customTags));
 
+        // --- Add public static fields under "fields" ---
+        List<Map<String, Object>> fields = new ArrayList<>();
+        for (Element member : classElement.getEnclosedElements()) {
+            if (member.getKind() == ElementKind.FIELD) {
+                Set<Modifier> modifiers = member.getModifiers();
+                if (modifiers.contains(Modifier.PUBLIC) && modifiers.contains(Modifier.STATIC)) {
+                    Map<String, Object> fieldJson = new LinkedHashMap<>();
+                    fieldJson.put("name", member.getSimpleName().toString());
+                    fieldJson.put("type", simplifyType(member.asType().toString()));
+                    // Add field Javadoc if present
+                    DocCommentTree fieldDoc = env.getDocTrees().getDocCommentTree(member);
+                    String fieldDesc = "";
+                    if (fieldDoc != null) {
+                        fieldDesc = convertToMarkdown(extractDescription(fieldDoc, currentPackage), currentPackage)
+                            .replace("\n", " ").replace("\r", " ").trim();
+                    }
+                    fieldJson.put("description", fieldDesc);
+                    fields.add(fieldJson);
+                }
+            }
+        }
+        if (!fields.isEmpty()) {
+            json.put("fields", fields);
+        }
+
         writeJsonToFile(json, classDir.resolve("index.md.json"));
     }
 
@@ -412,7 +437,7 @@ private void generateMethodJson(List<ExecutableElement> methods, String classNam
         }
         json.put("scratchblock", customTags.getOrDefault("scratchblock", ""));
         json.put("class", className);
-        json.put("description", finalDescription.trim());
+        json.put("description", finalDescription.replace("\n", " ").replace("\r", " ").trim());
         if (indexInDocs != null) {
             json.put("index", indexInDocs);
         }
@@ -584,7 +609,7 @@ private String extractDescriptionRaw(DocCommentTree docComment) {
      */
     private String convertToMarkdown(String html, String currentPackage) {
         // Convert <pre>{@code ...}</pre> to markdown code blocks
-        // Pattern matches: <pre>\s*{@code\s* ... }\s*</pre>
+        // Pattern matches: <pre>\s*\\{@code\s* ... }\s*</pre>
         String result = html.replaceAll(
                 "(?s)<pre>\\s*\\{@code\\s*(.*?)\\s*\\}\\s*</pre>",
                 "\n```java\n$1\n```\n");