deps: upgrade upstream

aya-prover · Apr 13, 2023 · 09d3294 · 09d3294
1 parent f66bd45
commit 09d3294
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/gradle/deps.properties b/gradle/deps.properties
@@ -1,3 +1,3 @@
 version.project=0.0.1-SNAPSHOT
 version.aya=0.29-SNAPSHOT
-version.aya-upstream=0.0.9
+version.aya-upstream=0.0.12
diff --git a/src/main/java/org/aya/intellij/language/AyaIJParserImpl.java b/src/main/java/org/aya/intellij/language/AyaIJParserImpl.java
@@ -10,6 +10,7 @@
 import kala.collection.SeqView;
 import kala.collection.immutable.ImmutableSeq;
 import kala.control.Either;
+import kala.text.StringSlice;
 import org.aya.cli.parse.AyaProducer;
 import org.aya.concrete.Expr;
 import org.aya.concrete.GenericAyaParser;
@@ -28,7 +29,7 @@
 
 public record AyaIJParserImpl(@NotNull Project project, @NotNull Reporter reporter) implements GenericAyaParser {
   @Override public @NotNull Expr expr(@NotNull String code, @NotNull SourcePos overridingSourcePos) {
-    var producer = new AyaProducer(Either.right(overridingSourcePos), reporter);
+    var producer = new AyaProducer(code, Either.right(overridingSourcePos), reporter);
     var expr = (AyaPsiElement) AyaPsiFactory.expr(project, code);
     return producer.expr(new ASTGenericNode(expr.getNode()));
   }
@@ -40,8 +41,9 @@ public record AyaIJParserImpl(@NotNull Project project, @NotNull Reporter report
       if (!(psiFile instanceof AyaPsiFile ayaFile))
         throw new IllegalArgumentException("File not found in IntelliJ documents: " + codeFile.display());
       // TODO: support literate mode
-      var updated = new SourceFile(codeFile.display(), codeFile.underlying(), ayaFile.getText());
-      var producer = new AyaProducer(Either.left(updated), reporter);
+      var code = ayaFile.getText();
+      var updated = new SourceFile(codeFile.display(), codeFile.underlying(), code);
+      var producer = new AyaProducer(code, Either.left(updated), reporter);
       return producer.program(new ASTGenericNode(ayaFile.getNode())).getLeftValue();
     });
   }
@@ -51,8 +53,8 @@ public record ASTGenericNode(@NotNull ASTNode node) implements GenericNode<ASTGe
       return node.getElementType();
     }
 
-    @Override public @NotNull String tokenText() {
-      return node.getText();
+    @Override public @NotNull StringSlice tokenText() {
+      return StringSlice.of(node.getText());
     }
 
     @Override public @NotNull TextRange range() {