fix compiling

ZZZank · May 30, 2024 · 9b71e27 · 9b71e27
1 parent 9e812a7
commit 9b71e27
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/com/probejs/compiler/rich/lang/RichLangCompiler.java b/src/main/java/com/probejs/compiler/rich/lang/RichLangCompiler.java
@@ -1,7 +1,6 @@
 package com.probejs.compiler.rich.lang;
 
 import com.google.gson.JsonArray;
-import com.mojang.datafixers.util.Pair;
 import com.probejs.ProbeJS;
 import com.probejs.ProbePaths;
 import java.io.BufferedWriter;
@@ -11,6 +10,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.probejs.util.Pair;
 import com.probejs.util.json.JObject;
 import com.probejs.util.json.JPrimitive;
 import lombok.val;

diff --git a/src/main/java/com/probejs/rewrite/doc/type/java/TypeClazz.java b/src/main/java/com/probejs/rewrite/doc/type/java/TypeClazz.java
@@ -47,6 +47,6 @@ public JavaType base() {
     @Override
     public Collection<Class<?>> relatedClasses() {
         //TODO: could be related to ClassWalker
-        return List.of();
+        return null;
     }
 }
diff --git a/src/main/java/com/probejs/rewrite/doc/type/typescript/TypeIntersection.java b/src/main/java/com/probejs/rewrite/doc/type/typescript/TypeIntersection.java
@@ -1,10 +1,12 @@
 package com.probejs.rewrite.doc.type.typescript;
 
+import com.github.bsideup.jabel.Desugar;
 import com.probejs.rewrite.doc.type.DocType;
 
 /**
  * aka TypeAnd, "string & number"
  * @author ZZZank
  */
+@Desugar
 public record TypeIntersection(DocType left, DocType right) implements TSType {
 }
diff --git a/src/main/java/com/probejs/rewrite/doc/type/typescript/TypeUnion.java b/src/main/java/com/probejs/rewrite/doc/type/typescript/TypeUnion.java
@@ -1,11 +1,13 @@
 package com.probejs.rewrite.doc.type.typescript;
 
+import com.github.bsideup.jabel.Desugar;
 import com.probejs.rewrite.doc.type.DocType;
 
 /**
  * aka TypeOr, "string | number"
  *
  * @author ZZZank
  */
+@Desugar
 public record TypeUnion(DocType left, DocType right) implements TSType {
 }