Moved native methods for TSTreeCursor to TSTreeCursor.Native class

Author: itsaky

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

@@ -39,7 +39,7 @@ public TSNode getChildByFieldName(String fieldName) {
   }
 
   public TSTreeCursor walk() {
-    return new TSTreeCursor(TreeSitter.treeCursorNew(this));
+    return new TSTreeCursor(this);
   }
 
   public TSNode findNodeWithType(final String type, final boolean namedOnly) {

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

@@ -1,42 +1,88 @@
 package com.itsaky.androidide.treesitter;
 
 public class TSTreeCursor implements AutoCloseable {
-  private long pointer;
+  private final long pointer;
   private int context0;
   private int context1;
   private long id;
   private long tree;
 
+  public TSTreeCursor(TSNode node) {
+    this(Native.newCursor(node));
+  }
+
   TSTreeCursor(long pointer) {
     this.pointer = pointer;
   }
 
+  /** Close and delete this tree cursor. */
   @Override
   public void close() {
-    TreeSitter.treeCursorDelete(pointer);
+    Native.delete(pointer);
   }
 
+  /**
+   * Get the current node of this tree cursor.
+   *
+   * @return The current {@link TSNode}.
+   */
   public TSNode getCurrentNode() {
-    return TreeSitter.treeCursorCurrentNode(pointer);
+    return Native.currentNode(pointer);
   }
 
+  /**
+   * Get the current field name.
+   *
+   * @return The field name.
+   */
   public String getCurrentFieldName() {
-    return TreeSitter.treeCursorCurrentFieldName(pointer);
+    return Native.currentFieldName(pointer);
   }
 
+  /**
+   * Get the current tree cursor node.
+   *
+   * @return The current tree cursor node.
+   */
   public TSTreeCursorNode getCurrentTreeCursorNode() {
-    return TreeSitter.treeCursorCurrentTreeCursorNode(pointer);
+    return Native.currentTreeCursorNode(pointer);
   }
 
+  /**
+   * Moves to the next child.
+   *
+   * @return <code>true</code> if moved successfully, <code>false</code> otherwise.
+   */
   public boolean gotoFirstChild() {
-    return TreeSitter.treeCursorGotoFirstChild(pointer);
+    return Native.gotoFirstChild(pointer);
   }
 
+  /**
+   * Moves to the next sibling node.
+   *
+   * @return <code>true</code> if moved successfully, <code>false</code> otherwise.
+   */
   public boolean gotoNextSibling() {
-    return TreeSitter.treeCursorGotoNextSibling(pointer);
+    return Native.gotoNextSibling(pointer);
   }
 
+  /**
+   * Moves to the parent node.
+   *
+   * @return <code>true</code> if moved successfully, <code>false</code> otherwise.
+   */
   public boolean gotoParent() {
-    return TreeSitter.treeCursorGotoParent(pointer);
+    return Native.gotoParent(pointer);
+  }
+
+  private static class Native {
+    public static native long newCursor(TSNode node);
+    public static native TSTreeCursorNode currentTreeCursorNode(long cursor);
+    public static native String currentFieldName(long cursor);
+    public static native TSNode currentNode(long cursor);
+    public static native void delete(long cursor);
+    public static native boolean gotoFirstChild(long cursor);
+    public static native boolean gotoNextSibling(long cursor);
+    public static native boolean gotoParent(long cursor);
   }
 }

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

@@ -10,68 +10,6 @@ public class TreeSitter {
   // ---------- Section: TSTreeCursor ----------
   // -------------------------------------------
 
-  /**
-   * Create a new {@link TSTreeCursor} for the given node.
-   *
-   * @param node The node.
-   * @return The pointer to the new {@link TSTreeCursor}.
-   */
-  public static native long treeCursorNew(TSNode node);
-
-  /**
-   * Get the current {@link TSTreeCursorNode}.
-   *
-   * @param cursor The pointer to the {@link TSTreeCursor}.
-   * @return The {@link TSTreeCursorNode}.
-   */
-  public static native TSTreeCursorNode treeCursorCurrentTreeCursorNode(long cursor);
-
-  /**
-   * Get the field name of the tree cursor's current node.
-   *
-   * <p>This returns <code>null</code> if the current node doesn't have a field.
-   */
-  public static native String treeCursorCurrentFieldName(long cursor);
-
-  /**
-   * Get the current node of the given {@link TSTreeCursor}.
-   *
-   * @param cursor The pointer to the {@link TSTreeCursor}.
-   * @return The current node of the cursor.
-   */
-  public static native TSNode treeCursorCurrentNode(long cursor);
-
-  /**
-   * Delete the given {@link TSTreeCursor}.
-   *
-   * @param cursor The pointer to the cursor.
-   */
-  public static native void treeCursorDelete(long cursor);
-
-  /**
-   * Instruct the given cursor to go to its first child.
-   *
-   * @param cursor The pointer to the cursor.
-   * @return <code>true</code> if moved successfully, <code>false</code> otherwise.
-   */
-  public static native boolean treeCursorGotoFirstChild(long cursor);
-
-  /**
-   * Instruct the given cursor to go to the next sibling node.
-   *
-   * @param cursor The pointer to the cursor.
-   * @return <code>true</code> if moved successfully, <code>false</code> otherwise.
-   */
-  public static native boolean treeCursorGotoNextSibling(long cursor);
-
-  /**
-   * Instruct the given cursor to go to the parent node of current node.
-   *
-   * @param cursor The pointer to the cursor.
-   * @return <code>true</code> if moved successfully, <code>false</code> otherwise.
-   */
-  public static native boolean treeCursorGotoParent(long cursor);
-
   // -------------------------------------------
   // ---------- Section: TSTree ----------------
   // -------------------------------------------

genh.sh

@@ -4,7 +4,7 @@ set -eu
 
 script_dir=$(realpath $(dirname $0))
 
-for header in TreeSitter TSLanguages.Native TSLanguage.Native TSParser.Native TSNode
+for header in TreeSitter TSLanguages.Native TSLanguage.Native TSParser.Native TSTreeCursor.Native TSNode
 do
   javah -d $script_dir/lib -classpath ${script_dir}/android-tree-sitter/src/main/java com.itsaky.androidide.treesitter.${header}
 done