diff --git a/src/main/java/org/aya/intellij/actions/run/AyaRunLineMarkerContributor.java b/src/main/java/org/aya/intellij/actions/run/AyaRunLineMarkerContributor.java index 8e2fb56..0a83c11 100644 --- a/src/main/java/org/aya/intellij/actions/run/AyaRunLineMarkerContributor.java +++ b/src/main/java/org/aya/intellij/actions/run/AyaRunLineMarkerContributor.java @@ -38,7 +38,7 @@ public class AyaRunLineMarkerContributor extends RunLineMarkerContributor { final var actions = ExecutorAction.getActions(Integer.MAX_VALUE); return new Info(AyaIcons.GUTTER_RUN, actions, element -> ImmutableSeq.of(actions) - .mapNotNull(action -> getText(action, element)) + .mapNotNull(action -> getText(action, createActionEvent(element))) .joinToString("\n")); } } diff --git a/src/main/java/org/aya/intellij/actions/search/ProofSearch.java b/src/main/java/org/aya/intellij/actions/search/ProofSearch.java index ef4bb78..66ea625 100644 --- a/src/main/java/org/aya/intellij/actions/search/ProofSearch.java +++ b/src/main/java/org/aya/intellij/actions/search/ProofSearch.java @@ -76,7 +76,7 @@ private static boolean matches(@NotNull ProofShape ps, @NotNull Term term) { static @NotNull String compile(int nested, @NotNull ProofShape ps) { return switch (ps) { - case ProofShape.App app when app.terms.sizeEquals(1) -> compile(nested, app.terms.first().shape); + case ProofShape.App app when app.terms.sizeEquals(1) -> compile(nested, app.terms.getFirst().shape); case ProofShape.App app -> paren(nested, app.terms.map(arg -> braced(arg.explicit(), compile(nested + 1, arg.shape)))); case ProofShape.AnyId $ -> "((?![ (){}:]).)+"; diff --git a/src/main/java/org/aya/intellij/psi/AyaPsiReference.java b/src/main/java/org/aya/intellij/psi/AyaPsiReference.java index 0666fdc..8fbdb4f 100644 --- a/src/main/java/org/aya/intellij/psi/AyaPsiReference.java +++ b/src/main/java/org/aya/intellij/psi/AyaPsiReference.java @@ -29,7 +29,7 @@ public AyaPsiReference(@NotNull AyaPsiElement element, TextRange rangeInElement) @Override public @Nullable AyaPsiNamedElement resolve() { return AyaLsp.use(myElement.getProject(), () -> null, - lsp -> lsp.gotoDefinition(myElement).firstOrNull()); + lsp -> lsp.gotoDefinition(myElement).getFirstOrNull()); } @Override public PsiElement handleElementRename(@NotNull String newName) throws IncorrectOperationException {