Moved native methods for TSParser to TSParser.Native class

Author: itsaky

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

@@ -10,37 +10,96 @@ public TSParser(long pointer) {
   }
 
   public TSParser() {
-    this(TreeSitter.newParser());
+    this(Native.newParser());
   }
 
+  /**
+   * Set the language of the given parser.
+   *
+   * @param language The language to set.
+   * @see TSLanguage
+   * @see TSLanguages
+   */
   public void setLanguage(TSLanguage language) {
-    TreeSitter.parserSetLanguage(pointer, language.pointer);
+    Native.setLanguage(pointer, language.pointer);
   }
 
+  /**
+   * Parses the given String source. Uses {@link TSInputEncoding#TSInputEncodingUTF8} as the default
+   * encoding.
+   *
+   * @param source The source code to parse.
+   * @return The parsed tree.
+   * @throws UnsupportedEncodingException
+   */
   public TSTree parseString(String source) throws UnsupportedEncodingException {
     return parseString(source, TSInputEncoding.TSInputEncodingUTF8);
   }
 
-  public TSTree parseString(String source, TSInputEncoding encoding) throws UnsupportedEncodingException {
+  /**
+   * Parses the given String source with the given encoding.
+   *
+   * @param source The source code to parse.
+   * @param encoding The encoding to of the source.
+   * @return The parsed tree.
+   * @throws UnsupportedEncodingException
+   */
+  public TSTree parseString(String source, TSInputEncoding encoding)
+      throws UnsupportedEncodingException {
     byte[] bytes = source.getBytes(encoding.getCharset());
-    return new TSTree(TreeSitter.parserParseBytes(pointer, bytes, bytes.length, encoding.getFlag()));
+    return new TSTree(Native.parseBytes(pointer, bytes, bytes.length, encoding.getFlag()));
   }
 
+  /**
+   * Parses the given bytes.
+   *
+   * @param bytes The bytes to parse.
+   * @param bytesLength The length of bytes to parse.
+   * @param encodingFlag The encoding of the source.
+   * @return The parsed tree.
+   */
   public TSTree parseBytes(byte[] bytes, int bytesLength, int encodingFlag) {
-    return new TSTree(TreeSitter.parserParseBytes(pointer, bytes, bytesLength, encodingFlag));
+    return new TSTree(Native.parseBytes(pointer, bytes, bytesLength, encodingFlag));
   }
 
+  /**
+   * @see #parseString(TSTree, String, TSInputEncoding)
+   */
   public TSTree parseString(TSTree oldTree, String source) throws UnsupportedEncodingException {
     return parseString(oldTree, source, TSInputEncoding.TSInputEncodingUTF8);
   }
 
-  public TSTree parseString(TSTree oldTree, String source, TSInputEncoding encoding) throws UnsupportedEncodingException {
+  /**
+   * Parses the given string source code.
+   *
+   * @param oldTree If earlier version of the same document has been parsed and you intend to do an
+   *     incremental parsing, then this should be the earlier parsed syntax tree. Otherwise <code>
+   *     null</code>.
+   * @param source The source code to parse.
+   * @param encoding The encoding of the source code.
+   * @return The parsed tree.
+   * @throws UnsupportedEncodingException
+   */
+  public TSTree parseString(TSTree oldTree, String source, TSInputEncoding encoding)
+      throws UnsupportedEncodingException {
     byte[] bytes = source.getBytes(encoding.getCharset());
-    return new TSTree(TreeSitter.parserIncrementalParseBytes(pointer, oldTree.getPointer(), bytes, bytes.length, encoding.getFlag()));
+    return new TSTree(
+        Native.incrementalParseBytes(
+            pointer, oldTree.getPointer(), bytes, bytes.length, encoding.getFlag()));
   }
 
+  /** Closes and deletes the current parser. */
   @Override
   public void close() {
-    TreeSitter.parserDelete(pointer);
+    Native.delete(pointer);
+  }
+
+  private static class Native {
+    public static native long newParser();
+    public static native void delete(long parser);
+    public static native void setLanguage(long parser, long language);
+    public static native long parseBytes(long parser, byte[] source, int length, int encoding);
+    public static native long incrementalParseBytes(
+        long parser, long old_tree, byte[] source, int length, int encoding);
   }
 }

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

@@ -2,33 +2,30 @@
 
 public class TSTree implements AutoCloseable {
 
-    private long pointer;
-
-    TSTree(long pointer) {
-        this.pointer = pointer;
-    }
-
-    @Override
-    public void close() {
-        TreeSitter.treeDelete(pointer);
-    }
-
-    public TSNode getRootNode() {
-        return TreeSitter.treeRootNode(pointer);
-    }
-
-    public TSTree copy() {
-        return new TSTree(TreeSitter.treeCopy(pointer));
-    }
-
-    public void edit(TSInputEdit edit) {
-        TreeSitter.treeEdit(
-            pointer,
-            edit
-        );
-    }
-
-    public long getPointer() {
-        return pointer;
-    }
+  private final long pointer;
+
+  TSTree(long pointer) {
+    this.pointer = pointer;
+  }
+
+  @Override
+  public void close() {
+    TreeSitter.treeDelete(pointer);
+  }
+
+  public TSNode getRootNode() {
+    return TreeSitter.treeRootNode(pointer);
+  }
+
+  public TSTree copy() {
+    return new TSTree(TreeSitter.treeCopy(pointer));
+  }
+
+  public void edit(TSInputEdit edit) {
+    TreeSitter.treeEdit(pointer, edit);
+  }
+
+  public long getPointer() {
+    return pointer;
+  }
 }

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

@@ -6,85 +6,6 @@ public class TreeSitter {
   // ---------- Section: TSParser --------------
   // -------------------------------------------
 
-  /**
-   * Create a new parser instance.
-   *
-   * @return The pointer to the new parser.
-   */
-  public static native long newParser();
-
-  /**
-   * Delete the parser.
-   *
-   * @param parser The pointer to the parser to delete.
-   */
-  public static native void parserDelete(long parser);
-
-  /**
-   * Set the language of the given parser.
-   *
-   * @param parser The pointer of the parser.
-   * @param language The language to set.
-   * @see TSLanguages
-   */
-  public static native void parserSetLanguage(long parser, long language);
-
-  /**
-   * Parse the given source with the given parser.
-   *
-   * @param parser The pointer of the parser to use.
-   * @param source The source code.
-   * @param length The length of the source code.
-   * @return The pointer to the parsed {@link TSTree}.
-   * @see #parserParseBytes(long, byte[], int, int)
-   */
-  public static long parserParseBytes(long parser, byte[] source, int length) {
-    return parserParseBytes(parser, source, length, TSInputEncoding.TSInputEncodingUTF8.getFlag());
-  }
-
-  /**
-   * Use the parser to parse the source code and create a new syntax tree.
-   *
-   * @param parser The pointer to the parser.
-   * @param old_tree The pointer to the old syntax tree.
-   * @param source The source code.
-   * @param length The length of the source code.
-   * @return The pointer to the new {@link TSTree}.
-   * @see #parserIncrementalParseBytes(long, long, byte[], int, int)
-   * @see TSInputEncoding
-   */
-  public static long parserIncrementalParseBytes(
-      long parser, long old_tree, byte[] source, int length) {
-    return parserIncrementalParseBytes(
-        parser, old_tree, source, length, TSInputEncoding.TSInputEncodingUTF8.getFlag());
-  }
-
-  /**
-   * Parse the given source with the given parser.
-   *
-   * @param parser The pointer of the parser to use.
-   * @param source The source code.
-   * @param length The length of the source code.
-   * @param encoding The encoding of the source code.
-   * @return The pointer to the parsed {@link TSTree}.
-   * @see TSInputEncoding
-   */
-  public static native long parserParseBytes(long parser, byte[] source, int length, int encoding);
-
-  /**
-   * Use the parser to parse the source code and create a new syntax tree.
-   *
-   * @param parser The pointer to the parser.
-   * @param old_tree The pointer to the old syntax tree.
-   * @param source The source code.
-   * @param length The length of the source code.
-   * @param encoding The encoding of the source code.
-   * @return The pointer to the new {@link TSTree}.
-   * @see TSInputEncoding
-   */
-  public static native long parserIncrementalParseBytes(
-      long parser, long old_tree, byte[] source, int length, int encoding);
-
   // -------------------------------------------
   // ---------- Section: TSTreeCursor ----------
   // -------------------------------------------

genh.sh

@@ -4,7 +4,7 @@ set -eu
 
 script_dir=$(realpath $(dirname $0))
 
-for header in TreeSitter TSLanguages.Native TSNode TSLanguage.Native
+for header in TreeSitter TSLanguages.Native TSLanguage.Native TSParser.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_TSParser_Native.h

@@ -1,22 +1,22 @@
-#include "com_itsaky_androidide_treesitter_TreeSitter.h"
+#include "com_itsaky_androidide_treesitter_TSParser_Native.h"
 #include "ts_utils.h"
 
 JNIEXPORT jlong JNICALL
-Java_com_itsaky_androidide_treesitter_TreeSitter_newParser(JNIEnv* env, jclass self) {
+Java_com_itsaky_androidide_treesitter_TSParser_00024Native_newParser(JNIEnv* env, jclass self) {
   return (jlong)ts_parser_new();
 }
 
-JNIEXPORT void JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_parserDelete(
+JNIEXPORT void JNICALL Java_com_itsaky_androidide_treesitter_TSParser_00024Native_delete(
   JNIEnv* env, jclass self, jlong parser) {
   ts_parser_delete((TSParser*)parser);
 }
 
-JNIEXPORT void JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_parserSetLanguage(
+JNIEXPORT void JNICALL Java_com_itsaky_androidide_treesitter_TSParser_00024Native_setLanguage(
   JNIEnv* env, jclass self, jlong parser, jlong language) {
   ts_parser_set_language((TSParser*)parser, (TSLanguage*)language);
 }
 
-JNIEXPORT jlong JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_parserParseBytes(
+JNIEXPORT jlong JNICALL Java_com_itsaky_androidide_treesitter_TSParser_00024Native_parseBytes(
   JNIEnv* env, jclass self, jlong parser, jbyteArray source_bytes,
   jint length, jint encodingFlag) {
   TSInputEncoding encoding = encodingFlag == 0 ? TSInputEncodingUTF8 : TSInputEncodingUTF16;
@@ -27,7 +27,7 @@ JNIEXPORT jlong JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_parserP
   return result;
 }
 
-JNIEXPORT jlong JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_parserIncrementalParseBytes(
+JNIEXPORT jlong JNICALL Java_com_itsaky_androidide_treesitter_TSParser_00024Native_incrementalParseBytes(
   JNIEnv* env, jclass self, jlong parser, jlong old_tree, jbyteArray source_bytes,
   jint length, jint encodingFlag) {
   TSInputEncoding encoding = encodingFlag == 0 ? TSInputEncodingUTF8 : TSInputEncodingUTF16;