update: wiki generator

sakurawald · Jul 21, 2024 · 58e133f · 58e133f
1 parent 684710f
commit 58e133f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/io/github/sakurawald/Fuji.java b/src/main/java/io/github/sakurawald/Fuji.java
@@ -28,7 +28,6 @@
 // TODO: a lisp-like DSL (parser and code-walker) for command with context and placeholders (%fuji:play_time_total% / nbt)
 // TODO: refactor command facility (selector, aop, options, parser)
 
-// TODO: a program to generate module reference DAG
 // TODO: tppos module
 
 public class Fuji implements ModInitializer {

diff --git a/src/main/java/io/github/sakurawald/generator/MarkdownDocsGenerator.java b/src/main/java/io/github/sakurawald/generator/MarkdownDocsGenerator.java
@@ -1,16 +1,10 @@
 package io.github.sakurawald.generator;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import lombok.Getter;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
 
-import java.nio.charset.Charset;
-import java.nio.file.Path;
 import java.util.Set;
 
 import static io.github.sakurawald.generator.JsonDocsGenerator.*;
@@ -87,8 +81,14 @@ private void walk(StringBuilder sb, int level, JsonObject node) {
 
             /* process normal json-elements */
             if (value.isJsonObject()) {
-                sb.append(getIndent(level + 1)).append("**%s**".formatted(key)).append(System.lineSeparator())
-                        .append(getIndent(level + 1)).append(System.lineSeparator());
+                sb.append(getIndent(level + 1)).append("**%s**".formatted(key)).append(System.lineSeparator());
+
+                boolean isModule = value.getAsJsonObject().has("enable");
+                if (isModule) {
+                    sb.append(getIndent(level + 1)).append(" **(module)**").append(System.lineSeparator());
+                }
+
+                sb.append(getIndent(level + 1)).append(System.lineSeparator());
 
                 // note: skip walk
                 if (keys.contains(key + SKIP_WALK)) {
@@ -98,7 +98,7 @@ private void walk(StringBuilder sb, int level, JsonObject node) {
 
                 walk(sb, level + 1, (JsonObject) value);
             } else {
-                 if (keys.contains(key + FIELD_DOCUMENTATION)) {
+                if (keys.contains(key + FIELD_DOCUMENTATION)) {
                     // field documentation
                     String documentation = node.get(key + FIELD_DOCUMENTATION).getAsString();
                     sb.append(indent).append("<table><tr><td>").append(System.lineSeparator())

diff --git a/src/test/java/checker/CheckModuleDependencyTest.java b/src/test/java/checker/CheckModuleDependencyTest.java
@@ -27,7 +27,7 @@
 @Slf4j
 public class CheckModuleDependencyTest {
 
-    public static final String COMMON = "common";
+    private static final String COMMON = "common";
     private static final Pattern importPattern = Pattern.compile("import\\s+(\\S+);");
     private static final Pattern staticImportPattern = Pattern.compile("import\\s+static\\s+(\\S+)\\.\\S+;");
     private static final Pattern moduleNamePattern = Pattern.compile("io\\.github\\.sakurawald\\.module\\.(?:initializer|mixin)\\.(\\S+)\\.\\S+;?");
@@ -80,6 +80,7 @@ private String extractModuleName(String className) {
         return moduleNameList.getFirst();
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     private boolean isRealModulePath(String moduleName) {
         JsonElement root = gson.toJsonTree(new ConfigModel());
         return JsonUtil.existsNode((JsonObject) root, "modules.%s.enable".formatted(moduleName));