Added APIs for version info & updated scripts

Author: itsaky

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

@@ -0,0 +1,18 @@
+package com.itsaky.androidide.treesitter;
+
+/**
+ * @author Akash Yadav
+ */
+public class TreeSitter {
+
+  /**
+   * The latest ABI version that is supported by the current version of the library. When Languages
+   * are generated by the Tree-sitter CLI, they are assigned an ABI version number that corresponds
+   * to the current CLI version. The Tree-sitter library is generally backwards-compatible with
+   * languages generated using older CLI versions, but is not forwards-compatible.
+   */
+  public static native int getLanguageVersion();
+
+  /** The earliest ABI version that is supported by the current version of the library. */
+  public static native int getMinimumCompatibleLanguageVersion();
+}

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

@@ -1,7 +1,17 @@
 package com.itsaky.androidide.treesitter;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Test;
+
 public class TestBase {
   static {
     System.load(System.getProperty("user.dir") + "/../output/host/libts.so");
   }
+
+  @Test
+  public void test() {
+    assertThat(TreeSitter.getLanguageVersion()).isEqualTo(14);
+    assertThat(TreeSitter.getMinimumCompatibleLanguageVersion()).isEqualTo(13);
+  }
 }

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

@@ -30,7 +30,7 @@ ndk_dir=""
 verbose_out=false
 
 OPTIND=1
-while getopts "h?sa:o:m:n:" opt; do
+while getopts "h?sva:o:m:n:" opt; do
   case "$opt" in
     h|\?)
       print_help
@@ -118,15 +118,14 @@ mkdir -p $dest_dir
 macros=""
 sources=""
 for file in ${script_dir}/lib/*; do
-  if [[ $file == *.h ]]; then
+  if [[ $file == *.h || -d $file ]]; then
     verbose "Skiping $file"
     continue
   fi
   sources+=${file}
   sources+=" "
 done
-# sources="${script_dir}/lib/ts.cc"
-# sources+=" ${script_dir}/lib/langs.cc"
+
 iscpp=""
 for lang in $*
 do
@@ -147,11 +146,20 @@ do
   macros+=" -DTS_LANGUAGE_${g_LANG}=1"
 done
 
-verbose "Sources --------------------------------\n" "$sources"
-verbose "Macros --------------------------------" "$macros"
+verbose
+verbose "Sources --------------------------------"
+for source in $sources; do
+  verbose $source
+done
+verbose ""
+verbose "Macros --------------------------------"
+for macro in $macros; do
+  verbose $macro
+done
+verbose ""
 
 objects=""
-includes="-I${script_dir}/tree-sitter/lib/include -I${script_dir}/tree-sitter/lib/src"
+includes="-I${script_dir}/tree-sitter/lib/include -I${script_dir}/tree-sitter/lib/src -I${script_dir}/lib/include"
 out_dir_base="${script_dir}/output/${clang_qualifier}"
 
 if [ ! -z "${for_host+x}" ]; then

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

@@ -2,9 +2,18 @@
 
 set -eu
 
+color="\033[32m"
+nocolor="\033[0m"
 script_dir=$(realpath $(dirname $0))
 
-for header in TSLanguages.Native TSLanguage.Native TSParser.Native TSTreeCursor.Native TSTree.Native TSQuery.Native TSQueryCursor.Native TSNode
-do
-  javah -d $script_dir/lib -classpath ${script_dir}/android-tree-sitter/src/main/java com.itsaky.androidide.treesitter.${header}
-done
+printf "${color}Finding java sources...${nocolor}\n"
+find ${script_dir}/android-tree-sitter/src/main/java -name "*.java" > sources.txt
+
+printf "${color}Generating headers...${nocolor}\n"
+out="${script_dir}/classes"
+mkdir $out
+javac -d ${out} -h ${script_dir}/lib/include @sources.txt
+
+printf "${color}"
+rm -rf ${out} sources.txt
+printf "${nocolor}"

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

@@ -4,6 +4,7 @@
             "name": "Linux",
             "includePath": [
                 "${workspaceFolder}/**",
+		"${workspaceFolder/include}",
                 "${workspaceFolder}/../tree-sitter/lib/src",
                 "${workspaceFolder}/../tree-sitter/lib/include",
                 "${env:JAVA_HOME}/include",
@@ -17,4 +18,4 @@
         }
     ],
     "version": 4
-}
+}