feat(node): add support for TSNode.getGrammarSymbol()

Author: itsaky

android-tree-sitter/src/main/cpp/ts_node.cc

@@ -227,8 +227,12 @@ static jstring TSNode_getType(JNIEnv *env, jclass clazz, jobject self) {
   return result;
 }
 
-static jint TSNode_getSymbol(JNIEnv *env, jclass clazz, jobject self) {
-  return (jint) ts_node_symbol(_unmarshalNode(env, self));
+static jshort TSNode_getSymbol(JNIEnv *env, jclass clazz, jobject self) {
+  return (jshort) ts_node_symbol(_unmarshalNode(env, self));
+}
+
+static jshort TSNode_getGrammarSymbol(JNIEnv *env, jclass clazz, jobject self) {
+  return (jshort) ts_node_grammar_symbol(_unmarshalNode(env, self));
 }
 
 static jboolean TSNode_isNull(JNIEnv *env, jclass clazz, jobject self) {
@@ -331,6 +335,7 @@ void TSNode_Native__SetJniMethods(JNINativeMethod *methods, int count) {
   SET_JNI_METHOD(methods, TSNode_Native_getEndPoint, TSNode_getEndPoint);
   SET_JNI_METHOD(methods, TSNode_Native_getType, TSNode_getType);
   SET_JNI_METHOD(methods, TSNode_Native_getSymbol, TSNode_getSymbol);
+  SET_JNI_METHOD(methods, TSNode_Native_getGrammarSymbol, TSNode_getGrammarSymbol);
   SET_JNI_METHOD(methods, TSNode_Native_isNull, TSNode_isNull);
   SET_JNI_METHOD(methods, TSNode_Native_isNamed, TSNode_isNamed);
   SET_JNI_METHOD(methods, TSNode_Native_isExtra, TSNode_isExtra);

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

@@ -535,11 +535,21 @@ public String getType() {
    *
    * @return The node's type as a numerical id.
    */
-  public int getSymbol() {
+  public short getSymbol() {
     checkAccess();
     return Native.getSymbol(this);
   }
 
+  /**
+   * Get the node's type as a numerical id as it appears in the grammar ignoring aliases. This
+   * should be used in {@link TSLanguage#getNextState(short, short)} instead of
+   * {@link #getSymbol()}.
+   */
+  public short getGrammarSymbol() {
+    checkAccess();
+    return Native.getGrammarSymbol(this);
+  }
+
   /**
    * Check if the node is null.
    */
@@ -708,7 +718,10 @@ private static final class Native {
     static native String getType(TSNode self);
 
     @FastNative
-    static native int getSymbol(TSNode self);
+    static native short getSymbol(TSNode self);
+
+    @FastNative
+    static native short getGrammarSymbol(TSNode self);
 
     @FastNative
     static native boolean isNull(TSNode self);

android-tree-sitter/src/test/java/com/itsaky/androidide/treesitter/NodeTest.java

@@ -90,6 +90,8 @@ public void multiTest() {
         assertThat(start.column).isEqualTo(0);
         assertThat(function.isEqualTo(function)).isTrue();
         assertThat(function.getFieldNameForChild(1)).isEqualTo("name");
+        assertThat(tree.getLanguage().getSymbolName(function.getGrammarSymbol())).isEqualTo(
+          "function_definition");
 
         end = function.getEndPoint();
         assertThat(end.row).isEqualTo(2);