Added implementation for the TSQueryCursor APIs

Author: itsaky

android-tree-sitter/build.gradle

@@ -73,8 +73,10 @@ for (def arch : archs) {
 }
 
 def buildFor(Task task, String arch, String classifier, String ndkDir, String javaHome) {
-    task.inputs.dir "${rootProject.projectDir.path}/lib"
-    task.outputs.file "${rootProject.projectDir.path}/output/${classifier}/libts.so"
+    def outputFile = new File("${rootProject.projectDir.path}/output/${classifier}/libts.so")
+    def inputs = rootProject.fileTree("lib").files
+    task.inputs.files(inputs)
+    task.outputs.file outputFile
 
     task.doLast {
         exec {

android-tree-sitter/src/main/java/com/itsaky/androidide/treesitter/TSQueryCapture.java

@@ -0,0 +1,17 @@
+package com.itsaky.androidide.treesitter;
+
+/**
+ * @author Akash Yadav
+ */
+public class TSQueryCapture {
+  private TSNode node;
+  private int index;
+
+  public TSNode getNode() {
+    return node;
+  }
+
+  public int getIndex() {
+    return index;
+  }
+}

android-tree-sitter/src/main/java/com/itsaky/androidide/treesitter/TSQueryCursor.java

@@ -16,6 +16,61 @@ public void exec(TSQuery query, TSNode node) {
     Native.exec(this.pointer, query.pointer, node);
   }
 
+  /**
+   * Whether the maximum number of in-progress matches allowed by this query cursor has been
+   * exceeded or not.
+   *
+   * <p>Query cursors have an optional maximum capacity for storing lists of in-progress captures.
+   * If this capacity is exceeded, then the earliest-starting match will silently be dropped to make
+   * room for further matches. This maximum capacity is optional — by default, query cursors allow
+   * any number of pending matches, dynamically allocating new space for them as needed as the query
+   * is executed.
+   */
+  public boolean didExceedMatchLimit() {
+    return Native.exceededMatchLimit(this.pointer);
+  }
+
+  /**
+   * Get the maximum number of in-progress matches allowed by this query * cursor.
+   *
+   * @return The match limit.
+   * @see #didExceedMatchLimit()
+   */
+  public int getMatchLimit() {
+    return Native.matchLimit(this.pointer);
+  }
+
+  /**
+   * Set the maximum number of in-progress matches allowed by this query * cursor.
+   *
+   * @param newLimit The new match limit.
+   * @see #didExceedMatchLimit()
+   */
+  public void setMatchLimit(int newLimit) {
+    Native.matchLimit(this.pointer, newLimit);
+  }
+
+  public void setByteRange(int start, int end) {
+    Native.setByteRange(this.pointer, start, end);
+  }
+
+  public void setPointRange(TSPoint start, TSPoint end) {
+    Native.setPointRange(this.pointer, start, end);
+  }
+
+  public TSQueryMatch nextMatch() {
+    TSQueryMatch match = new TSQueryMatch();
+    if (Native.nextMatch(this.pointer, match)) {
+      return match;
+    }
+
+    return null;
+  }
+
+  public void removeMatch(int id) {
+    Native.removeMatch(this.pointer, id);
+  }
+
   @Override
   public void close() throws Exception {
     Native.delete(this.pointer);
@@ -27,5 +82,19 @@ private static class Native {
     public static native void delete(long cursor);
 
     public static native void exec(long cursor, long query, TSNode node);
+
+    public static native boolean exceededMatchLimit(long cursor);
+
+    public static native void matchLimit(long cursor, int newLimit);
+
+    public static native int matchLimit(long cursor);
+
+    public static native void setByteRange(long cursor, int start, int end);
+
+    public static native void setPointRange(long cursor, TSPoint start, TSPoint end);
+
+    public static native boolean nextMatch(long cursor, TSQueryMatch match);
+
+    public static native void removeMatch(long cursor, int id);
   }
 }

android-tree-sitter/src/main/java/com/itsaky/androidide/treesitter/TSQueryMatch.java

@@ -0,0 +1,26 @@
+package com.itsaky.androidide.treesitter;
+
+/**
+ * @author Akash Yadav
+ */
+public class TSQueryMatch {
+  private int id;
+  private int patternIndex;
+  private TSQueryCapture[] captures;
+
+  public int getId() {
+    return id;
+  }
+
+  public int getPatternIndex() {
+    return patternIndex;
+  }
+
+  public TSQueryCapture[] getCaptures() {
+    return captures;
+  }
+
+  public TSQueryCapture getCapture(int index) {
+    return captures[index];
+  }
+}

android-tree-sitter/src/main/jniLibs/arm64-v8a/libts.so

@@ -1,5 +1,7 @@
 package com.itsaky.androidide.treesitter;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import org.junit.Test;
 
 /**
@@ -8,14 +10,27 @@
 public class QueryTest extends TestBase {
 
   @Test
-  public void test() throws Exception {
+  public void implementationTest() throws Exception {
     try (final var parser = new TSParser()) {
       parser.setLanguage(TSLanguages.java());
       try (final var tree = parser.parseString("public class MyClass { int x = 0; }");
           final var query = new TSQuery(tree.getLanguage(), "(class_body)");
           final var cursor = new TSQueryCursor()) {
         cursor.exec(query, tree.getRootNode());
+        TSQueryMatch match;
+        while((match = cursor.nextMatch()) != null) {
+          assertThat(match.getCaptures()).isNotEmpty();
+        }
       }
     }
   }
+
+  @Test
+  public void testError() throws Exception {
+    try (TSQuery query = new TSQuery(TSLanguages.java(), "(class_declaration")) {
+      assertThat(query.pointer).isEqualTo(0);
+      assertThat(query.getErrorOffset()).isEqualTo("(class_declaration".length());
+      assertThat(query.getErrorType()).isEqualTo(TSQueryError.Syntax);
+    }
+  }
 }

android-tree-sitter/src/main/jniLibs/armeabi-v7a/libts.so

@@ -6,4 +6,5 @@ plugins {
 
 task clean {
     delete "output"
+    delete "build"
 }