revert: "lsp-test: advisor now extends DiskCompilerAdvisor (with some bug)"

This reverts commit b9d49e5.

Author: ice1000

Diff for: ide-lsp/src/test/java/org/aya/lsp/LspTest.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2025 Tesla (Yinsen) Zhang.
+// Copyright (c) 2020-2024 Tesla (Yinsen) Zhang.
 // Use of this source code is governed by the MIT license that can be found in the LICENSE.md file.
 package org.aya.lsp;
 
@@ -15,16 +15,13 @@
 import org.aya.syntax.concrete.stmt.decl.FnDecl;
 import org.aya.syntax.core.term.MetaPatTerm;
 import org.aya.syntax.core.term.call.DataCall;
-import org.aya.util.FileUtil;
 import org.javacs.lsp.InitializeParams;
 import org.javacs.lsp.Position;
 import org.javacs.lsp.TextDocumentIdentifier;
 import org.javacs.lsp.TextDocumentPositionParams;
 import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
 import java.nio.file.Path;
 
 import static org.aya.lsp.tester.TestCommand.compile;
@@ -40,11 +37,6 @@ public class LspTest {
     return client;
   }
 
-  // FIXME: remove this after fixing the prim factory problem
-  @BeforeEach public void clearCore() throws IOException {
-    FileUtil.deleteRecursively(TEST_LIB.resolve("build"));
-  }
-
   @Test public void testJustLoad() {
     launch(TEST_LIB).execute(compile((_, _) -> {}));
   }

Diff for: ide-lsp/src/test/java/org/aya/lsp/tester/LspTestCompilerAdvisor.java

@@ -1,12 +1,10 @@
-// Copyright (c) 2020-2025 Tesla (Yinsen) Zhang.
+// Copyright (c) 2020-2024 Tesla (Yinsen) Zhang.
 // Use of this source code is governed by the MIT license that can be found in the LICENSE.md file.
 package org.aya.lsp.tester;
 
 import kala.collection.SeqView;
 import kala.collection.immutable.ImmutableSeq;
 import kala.collection.mutable.MutableList;
-import kala.collection.mutable.MutableMap;
-import org.aya.cli.library.incremental.DiskCompilerAdvisor;
 import org.aya.cli.library.incremental.InMemoryCompilerAdvisor;
 import org.aya.cli.library.source.LibrarySource;
 import org.aya.resolve.ResolveInfo;
@@ -15,16 +13,10 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.FileTime;
-import java.time.Instant;
 import java.util.function.Function;
 
-public class LspTestCompilerAdvisor extends DiskCompilerAdvisor {
+public class LspTestCompilerAdvisor extends InMemoryCompilerAdvisor {
   public @Nullable ImmutableSeq<ImmutableSeq<LibrarySource>> lastJob;
-  public final @NotNull MutableMap<Path, FileTime> newlyModified = MutableMap.create();
   public final @NotNull MutableList<ResolveInfo> newlyCompiled = MutableList.create();
 
   public @NotNull SeqView<LibrarySource> lastCompiled() {
@@ -34,24 +26,7 @@ public class LspTestCompilerAdvisor extends DiskCompilerAdvisor {
   }
 
   public void mutate(@NotNull LibrarySource source) {
-    newlyModified.put(source.underlyingFile(), FileTime.from(Instant.now()));
-  }
-
-  @Override
-  public boolean isSourceModified(@NotNull LibrarySource source) {
-    var tempFileTime = newlyModified.getOrNull(source.underlyingFile());
-    if (tempFileTime != null) {
-      try {
-        // TODO: duplicate code as in [InMemoryCompilerAdvisor] and [DiskCompilerAdvisor]
-        var core = source.compiledCorePath();
-        if (!Files.exists(core)) return true;
-        return tempFileTime.compareTo(Files.getLastModifiedTime(core)) > 0;
-      } catch (IOException e) {
-        return true;
-      }
-    }
-
-    return super.isSourceModified(source);
+    coreTimestamp.remove(timestampKey(source));
   }
 
   public void prepareCompile() {
@@ -65,12 +40,7 @@ public void prepareCompile() {
   }
 
   @Override public @NotNull ResolveInfo
-  doSaveCompiledCore(
-    @NotNull LibrarySource file,
-    @NotNull ResolveInfo resolveInfo,
-    @NotNull ImmutableSeq<TyckDef> defs,
-    @NotNull ModuleLoader recurseLoader
-  ) throws IOException, ClassNotFoundException {
+  doSaveCompiledCore(@NotNull LibrarySource file, @NotNull ResolveInfo resolveInfo, @NotNull ImmutableSeq<TyckDef> defs, @NotNull ModuleLoader recurseLoader) {
     var info = super.doSaveCompiledCore(file, resolveInfo, defs, recurseLoader);
     newlyCompiled.append(resolveInfo);
     return info;

Diff for: syntax/src/main/java/org/aya/syntax/compile/JitUnit.java

@@ -9,7 +9,7 @@
 import org.aya.util.error.Panic;
 import org.jetbrains.annotations.NotNull;
 
-public abstract class JitUnit {
+public abstract sealed class JitUnit permits JitDef, JitMatchy {
   private CompiledAya metadata;
 
   public @NotNull final CompiledAya metadata() {