Implemented TSParser.getLanguage()

Author: itsaky

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

@@ -24,6 +24,15 @@ public void setLanguage(TSLanguage language) {
     Native.setLanguage(pointer, language.pointer);
   }
 
+  /**
+   * Get the language for this parser instance.
+   *
+   * @return The language instance.
+   */
+  public TSLanguage getLanguage() {
+    return new TSLanguage(Native.getLanguage(this.pointer));
+  }
+
   /**
    * Parses the given String source. Uses {@link TSInputEncoding#TSInputEncodingUTF8} as the default
    * encoding.
@@ -96,9 +105,15 @@ public void close() {
 
   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 getLanguage(long parser);
+
     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/jniLibs/arm64-v8a/libts.so

@@ -31,6 +31,7 @@ public void testCodeEditor() throws Throwable {
     final long start = System.currentTimeMillis();
     try (TSParser parser = new TSParser()) {
       parser.setLanguage(TSLanguages.java());
+      assertThat(parser.getLanguage().pointer).isEqualTo(TSLanguages.java().pointer);
       try (var tree =
           parser.parseString(
               readString(Paths.get("./src/test/resources/CodeEditor.java.txt")),

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

@@ -1,4 +1,3 @@
-#include "com_itsaky_androidide_treesitter_TreeSitter.h"
 #include "com_itsaky_androidide_treesitter_TSNode.h"
 #include "ts_utils.h"
 

android-tree-sitter/src/main/jniLibs/x86/libts.so

@@ -2,38 +2,53 @@
 #include "ts_utils.h"
 
 JNIEXPORT jlong JNICALL
-Java_com_itsaky_androidide_treesitter_TSParser_00024Native_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_TSParser_00024Native_delete(
-  JNIEnv* env, jclass self, jlong parser) {
+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_TSParser_00024Native_setLanguage(
-  JNIEnv* env, jclass self, jlong parser, jlong language) {
+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_TSParser_00024Native_parseBytes(
-  JNIEnv* env, jclass self, jlong parser, jbyteArray source_bytes,
-  jint length, jint encodingFlag) {
-  TSInputEncoding encoding = encodingFlag == 0 ? TSInputEncodingUTF8 : TSInputEncodingUTF16;
+JNIEXPORT jlong JNICALL
+Java_com_itsaky_androidide_treesitter_TSParser_00024Native_getLanguage(
+    JNIEnv* env, jclass self, jlong parser) {
+  return (jlong)ts_parser_language((TSParser*)parser);
+}
+
+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;
   jbyte* source = env->GetByteArrayElements(source_bytes, NULL);
   jlong result = (jlong)ts_parser_parse_string_encoding(
-                   (TSParser*)parser, NULL, reinterpret_cast<const char*>(source), length, encoding);
+      (TSParser*)parser, NULL, reinterpret_cast<const char*>(source), length,
+      encoding);
   env->ReleaseByteArrayElements(source_bytes, source, JNI_ABORT);
   return result;
 }
 
-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;
+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;
   jbyte* source = env->GetByteArrayElements(source_bytes, NULL);
   jlong result = (jlong)ts_parser_parse_string_encoding(
-                   (TSParser*)parser, (TSTree*)old_tree, reinterpret_cast<const char*>(source), length, TSInputEncodingUTF16);
+      (TSParser*)parser, (TSTree*)old_tree,
+      reinterpret_cast<const char*>(source), length, TSInputEncodingUTF16);
   env->ReleaseByteArrayElements(source_bytes, source, JNI_ABORT);
   return result;
 }