Moved native methods for TSTree to TSTree.Native class

Author: itsaky

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

@@ -8,24 +8,52 @@ public class TSTree implements AutoCloseable {
     this.pointer = pointer;
   }
 
+  /** Close and delete this tree. */
   @Override
   public void close() {
-    TreeSitter.treeDelete(pointer);
+    Native.delete(pointer);
   }
 
+  /**
+   * Get the root node of this tree.
+   *
+   * @return The root node.
+   */
   public TSNode getRootNode() {
-    return TreeSitter.treeRootNode(pointer);
+    return Native.rootNode(pointer);
   }
 
+  /**
+   * Make a shallow copy of this tree. This is very fast.
+   *
+   * @return The copy of this tree.
+   */
   public TSTree copy() {
-    return new TSTree(TreeSitter.treeCopy(pointer));
+    return new TSTree(Native.copy(pointer));
   }
 
+  /**
+   * Notify that this tree has been edited.
+   *
+   * @param edit The edit.
+   */
   public void edit(TSInputEdit edit) {
-    TreeSitter.treeEdit(pointer, edit);
+    Native.edit(pointer, edit);
   }
 
-  public long getPointer() {
+  /**
+   * Get the pointer of this tree.
+   *
+   * @return The pointer.
+   */
+  long getPointer() {
     return pointer;
   }
+
+  private static class Native {
+    public static native void edit(long tree, TSInputEdit inputEdit);
+    public static native void delete(long tree);
+    public static native long copy(long tree);
+    public static native TSNode rootNode(long tree);
+  }
 }

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

@@ -2,52 +2,8 @@
 
 public class TreeSitter {
 
-  // -------------------------------------------
-  // ---------- Section: TSParser --------------
-  // -------------------------------------------
-
-  // -------------------------------------------
-  // ---------- Section: TSTreeCursor ----------
-  // -------------------------------------------
-
   // -------------------------------------------
   // ---------- Section: TSTree ----------------
   // -------------------------------------------
-  /**
-   * Notify that the tree has been edited.
-   *
-   * @param tree The pointer to the tree.
-   * @param inputEdit The edit descriptor.
-   */
-  public static native void treeEdit(long tree, TSInputEdit inputEdit);
-
-  /**
-   * Delete the given tree.
-   *
-   * @param tree The pointer to the tree.
-   */
-  public static native void treeDelete(long tree);
-
-  /**
-   * Creates shallow of the given tree. This is very fast. Suitable for use in multiple threads.
-   *
-   * @param tree The pointer to the tree to copy.
-   * @return The pointer to the copied tree.
-   */
-  public static native long treeCopy(long tree);
-
-  /**
-   * Get the root node of the given tree.
-   *
-   * @param tree The pointer to the tree.
-   * @return The root node.
-   */
-  public static native TSNode treeRootNode(long tree);
-
-  /**
-   * @param language
-   * @param source
-   * @return
-   */
   public static native long tsQueryNew(long language, String source);
 }

genh.sh

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

lib/com_itsaky_androidide_treesitter_TSTree_Native.h

@@ -1,24 +1,24 @@
-#include "com_itsaky_androidide_treesitter_TreeSitter.h"
+#include "com_itsaky_androidide_treesitter_TSTree_Native.h"
 #include "ts_utils.h"
 
-JNIEXPORT void JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeEdit(
+JNIEXPORT void JNICALL Java_com_itsaky_androidide_treesitter_TSTree_00024Native_edit(
   JNIEnv* env, jclass self, jlong tree, jobject inputEdit) {
 
   TSInputEdit edit = _unmarshalInputEdit(env, inputEdit);
   ts_tree_edit((TSTree*) tree, &edit);
 }
 
-JNIEXPORT void JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeDelete(
+JNIEXPORT void JNICALL Java_com_itsaky_androidide_treesitter_TSTree_00024Native_delete(
   JNIEnv* env, jclass self, jlong tree) {
   ts_tree_delete((TSTree*)tree);
 }
 
-JNIEXPORT jlong JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeCopy(
+JNIEXPORT jlong JNICALL Java_com_itsaky_androidide_treesitter_TSTree_00024Native_copy(
   JNIEnv* env, jclass self, jlong tree) {
   return (jlong) ts_tree_copy((TSTree*)tree);
 }
 
-JNIEXPORT jobject JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeRootNode(
+JNIEXPORT jobject JNICALL Java_com_itsaky_androidide_treesitter_TSTree_00024Native_rootNode(
   JNIEnv* env, jclass self, jlong tree) {
   return _marshalNode(env, ts_tree_root_node((TSTree*)tree));
 }