fix: all languages not available in sample app

Author: itsaky

.idea/codeStyles/codeStyleConfig.xml

@@ -51,7 +51,10 @@ dependencies {
 
     implementation project(path: ':android-tree-sitter')
     implementation project(path: ':tree-sitter-java')
+    implementation project(path: ':tree-sitter-json')
+    implementation project(path: ':tree-sitter-kotlin')
     implementation project(path: ':tree-sitter-python')
+    implementation project(path: ':tree-sitter-xml')
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

app/build.gradle

@@ -21,69 +21,87 @@
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
-
+import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-
 import com.itsaky.androidide.androidtreesitter.databinding.ActivityMainBinding;
 import com.itsaky.androidide.androidtreesitter.databinding.ContentMainBinding;
 import com.itsaky.androidide.treesitter.TSLanguage;
 import com.itsaky.androidide.treesitter.TSParser;
 import com.itsaky.androidide.treesitter.TSTreeCursor;
-import com.itsaky.androidide.treesitter.string.UTF16String;
 import com.itsaky.androidide.treesitter.java.TSLanguageJava;
+import com.itsaky.androidide.treesitter.json.TSLanguageJson;
+import com.itsaky.androidide.treesitter.kotlin.TSLanguageKotlin;
 import com.itsaky.androidide.treesitter.python.TSLanguagePython;
 import com.itsaky.androidide.treesitter.string.UTF16StringFactory;
-
+import com.itsaky.androidide.treesitter.xml.TSLanguageXml;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author Akash Yadav
  */
 public class MainActivity extends AppCompatActivity {
 
+  private static final Map<String, TSLanguage> languageMap;
+
   static {
     System.loadLibrary("android-tree-sitter");
     System.loadLibrary("tree-sitter-java");
+    System.loadLibrary("tree-sitter-json");
+    System.loadLibrary("tree-sitter-kotlin");
     System.loadLibrary("tree-sitter-python");
+    System.loadLibrary("tree-sitter-xml");
+
+    languageMap = new HashMap<>();
+    languageMap.put("Java", TSLanguageJava.newInstance());
+    languageMap.put("JSON", TSLanguageJson.newInstance());
+    languageMap.put("Kotlin", TSLanguageKotlin.newInstance());
+    languageMap.put("Python", TSLanguagePython.newInstance());
+    languageMap.put("XML", TSLanguageXml.newInstance());
   }
 
-  private final TSLanguage[] langs = {TSLanguageJava.newInstance(), TSLanguagePython.newInstance()};
-  private ActivityMainBinding binding;
   private ContentMainBinding content;
 
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    binding = ActivityMainBinding.inflate(getLayoutInflater());
+    com.itsaky.androidide.androidtreesitter.databinding.ActivityMainBinding binding = ActivityMainBinding.inflate(
+        getLayoutInflater());
     content = binding.content;
 
     setContentView(binding.getRoot());
     setSupportActionBar(binding.toolbar);
 
+    content.languageChooser.setAdapter(
+        new ArrayAdapter<>(this, android.R.layout.simple_list_item_1,
+            languageMap.keySet().toArray(new String[0])));
+
     // new String(byte[], String) is not supported on Android)
     // so we use ByteBuffer to decode the string
     // Test working of UTF16String.toString() on Android
     final var utf16String = UTF16StringFactory.newString("android-tree-sitter UTF16String");
     Log.d("MainActivity", "UTF16Str: " + utf16String);
     utf16String.close();
 
-    content.code.addTextChangedListener(
-        new Watcher() {
-          @Override
-          public void afterTextChanged(Editable editable) {
-            afterInputChanged(editable);
-          }
-        });
+    content.code.addTextChangedListener(new Watcher() {
+      @Override
+      public void afterTextChanged(Editable editable) {
+        afterInputChanged(editable);
+      }
+    });
   }
 
   private void afterInputChanged(Editable editable) {
     final var start = System.currentTimeMillis();
     try (final var parser = new TSParser()) {
-      parser.setLanguage(langs[content.languageChooser.getSelectedItemPosition()]);
+      parser.setLanguage(Objects.requireNonNull(
+          languageMap.get((String) content.languageChooser.getSelectedItem())));
       try (final var tree = parser.parseString(editable.toString())) {
         try (final var cursor = tree.getRootNode().walk()) {
           final var duration = System.currentTimeMillis() - start;
@@ -134,10 +152,13 @@ private void repeatSpaces(StringBuilder sb, int count) {
   }
 
   private abstract static class Watcher implements TextWatcher {
+
     @Override
-    public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
+    public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+    }
 
     @Override
-    public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
+    public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+    }
   }
 }

app/src/main/java/com/itsaky/androidide/androidtreesitter/MainActivity.java

@@ -28,7 +28,6 @@
         android:layout_width="0dp"
         android:layout_height="48dp"
         android:layout_marginTop="16dp"
-        android:entries="@array/languages"
         app:layout_constraintEnd_toEndOf="@id/textInputLayout"
         app:layout_constraintStart_toStartOf="@id/textInputLayout"
         app:layout_constraintTop_toBottomOf="@id/textInputLayout" />

app/src/main/res/layout/content_main.xml

@@ -1,7 +1,3 @@
 <resources>
     <string name="app_name">AndroidTreeSitter</string>
-    <string-array name="languages">
-        <item>Java</item>
-        <item>Python</item>
-    </string-array>
 </resources>