Merge pull request #132 from seart-group/feature/fields

seart-group · Feb 13, 2024 · 0a5bce1 · 0a5bce1
2 parents 84f70ad + d9ebc33
commit 0a5bce1
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 8 deletions.
diff --git a/lib/ch_usi_si_seart_treesitter_Language.cc b/lib/ch_usi_si_seart_treesitter_Language.cc
@@ -541,6 +541,14 @@ JNIEXPORT jint JNICALL Java_ch_usi_si_seart_treesitter_Language_fields(
   return (jint)ts_language_field_count(language);
 }
 
+JNIEXPORT jstring JNICALL Java_ch_usi_si_seart_treesitter_Language_field(
+  JNIEnv* env, jclass self, jlong languageId, jint fieldId) {
+  TSLanguage* language = (TSLanguage*)languageId;
+  TSFieldId field = (TSFieldId)fieldId;
+  const char* name = ts_language_field_name_for_id(language, field);
+  return env->NewStringUTF(name);
+}
+
 JNIEXPORT jint JNICALL Java_ch_usi_si_seart_treesitter_Language_states(
   JNIEnv* env, jclass self, jlong id) {
   TSLanguage* language = (TSLanguage*)id;

diff --git a/lib/ch_usi_si_seart_treesitter_Language.h b/lib/ch_usi_si_seart_treesitter_Language.h
diff --git a/src/main/java/ch/usi/si/seart/treesitter/Language.java b/src/main/java/ch/usi/si/seart/treesitter/Language.java
@@ -540,13 +540,14 @@ public static void validate(@NotNull Language language) {
     private static native int symbols(long id);
     private static native Symbol symbol(long languageId, int symbolId);
     private static native int fields(long id);
+    private static native String field(long languageId, int fieldId);
     private static native int states(long id);
 
     long id;
     int version;
-    int totalFields;
     int totalStates;
-    Collection<Symbol> symbols;
+    List<Symbol> symbols;
+    List<String> fields;
     List<String> extensions;
 
     private static final long INVALID = 0L;
@@ -574,17 +575,19 @@ public static void validate(@NotNull Language language) {
             ));
 
     Language(long id, String... extensions) {
-        this(id, version(id), fields(id), states(id), symbols(id), List.of(extensions));
+        this(id, version(id), states(id), symbols(id), fields(id), List.of(extensions));
     }
 
-    Language(long id, int version, int totalFields, int totalStates, int totalSymbols, List<String> extensions) {
+    Language(long id, int version, int totalStates, int totalSymbols, int totalFields, List<String> extensions) {
         this.id = id;
         this.version = version;
-        this.totalFields = totalFields;
         this.totalStates = totalStates;
         this.symbols = IntStream.range(0, totalSymbols)
                 .mapToObj(symbolId -> symbol(id, symbolId))
                 .collect(Collectors.toUnmodifiableList());
+        this.fields = IntStream.range(1, totalFields + 1)
+                .mapToObj(fieldId -> field(id, fieldId))
+                .collect(Collectors.toUnmodifiableList());
         this.extensions = extensions;
     }
 
@@ -628,12 +631,24 @@ public int nextState(@NotNull Node node) {
 
     private static native int nextState(long id, int state, int symbol);
 
+    /**
+     * @deprecated Just calculate the {@link List#size() size} of the list returned by {@link #getSymbols()}.
+     */
     @Generated
-    @SuppressWarnings("unused")
+    @Deprecated(forRemoval = true, since = "1.12.0")
     public int getTotalSymbols() {
         return symbols.size();
     }
 
+    /**
+     * @deprecated Just calculate the {@link List#size() size} of the list returned by {@link #getFields()}.
+     */
+    @Generated
+    @Deprecated(forRemoval = true, since = "1.12.0")
+    public int getTotalFields() {
+        return fields.size();
+    }
+
     @Override
     public String toString() {
         switch (this) {

diff --git a/src/test/java/ch/usi/si/seart/treesitter/BaseTest.java b/src/test/java/ch/usi/si/seart/treesitter/BaseTest.java
@@ -26,10 +26,10 @@ public abstract class BaseTest {
 
         Mockito.when(invalid.getId()).thenReturn(0L);
         Mockito.when(invalid.getVersion()).thenReturn(0);
-        Mockito.when(invalid.getTotalFields()).thenReturn(0);
         Mockito.when(invalid.getTotalStates()).thenReturn(0);
-        Mockito.when(invalid.getTotalSymbols()).thenReturn(0);
         Mockito.when(invalid.getSymbols()).thenReturn(List.of());
+        Mockito.when(invalid.getFields()).thenReturn(List.of());
+        Mockito.when(invalid.getExtensions()).thenReturn(List.of());
 
         Mockito.when(invalid.nextState(Mockito.any())).thenCallRealMethod();
     }