diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b92c7aa32..1884d79ba 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ annotations = "24.1.0" kala = "0.74.0" # https://picocli.info picocli = "4.7.6" -build-util = "0.0.25" +build-util = "0.0.26" # https://github.com/jline/jline3 jline = "3.26.2" # https://github.com/commonmark/commonmark-java diff --git a/producer/src/main/java/org/aya/producer/AyaProducer.java b/producer/src/main/java/org/aya/producer/AyaProducer.java index bef928214..291611324 100644 --- a/producer/src/main/java/org/aya/producer/AyaProducer.java +++ b/producer/src/main/java/org/aya/producer/AyaProducer.java @@ -285,7 +285,7 @@ private record DeclParseData( var fnMods = info.modifier().toFnModifiers(); var tele = telescope(node.childrenOfType(TELE)); - var dynamite = fnBody(tele.map(Expr.Param::ref), fnBodyNode); + var dynamite = fnBody(fnBodyNode); if (dynamite == null) return null; var inline = info.modifier.misc(ModifierParser.CModifier.Inline); var overlap = info.modifier.misc(ModifierParser.CModifier.Overlap); @@ -302,7 +302,7 @@ private record DeclParseData( return fnDecl; } - public @Nullable FnBody fnBody(@NotNull ImmutableSeq vars, @NotNull GenericNode node) { + public @Nullable FnBody fnBody(@NotNull GenericNode node) { var expr = node.peekChild(EXPR); var implies = node.peekChild(IMPLIES); if (expr == null && implies != null) return error(implies, "Expect function body"); diff --git a/producer/src/main/java/org/aya/producer/ParserUtil.java b/producer/src/main/java/org/aya/producer/ParserUtil.java index b0230037f..1525a0d38 100644 --- a/producer/src/main/java/org/aya/producer/ParserUtil.java +++ b/producer/src/main/java/org/aya/producer/ParserUtil.java @@ -3,8 +3,8 @@ package org.aya.producer; import com.intellij.lang.Language; +import com.intellij.lang.PsiBuilder; import com.intellij.psi.TokenType; -import com.intellij.psi.builder.FleetPsiBuilder; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; import org.aya.intellij.GenericNode; @@ -32,7 +32,7 @@ public interface ParserUtil { static @NotNull IFileElementType forLanguage(@NotNull Language language) { return new IFileElementType(language) { - @Override public void parse(@NotNull FleetPsiBuilder builder) { + @Override public void parse(@NotNull PsiBuilder builder) { } }; }