feat!: update API to 0.26

Author: ObserverOfTime

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "tree-sitter"]
     url = https://github.com/tree-sitter/tree-sitter
     path = core
-    branch = release-0.25
+    branch = release-0.26

core

@@ -90,7 +90,6 @@ $lib = "$($args[0])/core/lib"
     --include-function ts_node_string `
     --include-function ts_node_symbol `
     --include-function ts_node_type `
-    --include-function ts_parser_cancellation_flag `
     --include-function ts_parser_delete `
     --include-function ts_parser_included_ranges `
     --include-function ts_parser_language `
@@ -102,12 +101,10 @@ $lib = "$($args[0])/core/lib"
     --include-function ts_parser_parse_with_options `
     --include-function ts_parser_print_dot_graphs `
     --include-function ts_parser_reset `
-    --include-function ts_parser_set_cancellation_flag `
     --include-function ts_parser_set_included_ranges `
     --include-function ts_parser_set_language `
     --include-function ts_parser_set_logger `
-    --include-function ts_parser_set_timeout_micros `
-    --include-function ts_parser_timeout_micros `
+    --include-function ts_point_edit `
     --include-function ts_query_capture_count `
     --include-function ts_query_capture_name_for_id `
     --include-function ts_query_capture_quantifier_for_id `
@@ -121,11 +118,11 @@ $lib = "$($args[0])/core/lib"
     --include-function ts_query_cursor_next_match `
     --include-function ts_query_cursor_remove_match `
     --include-function ts_query_cursor_set_byte_range `
+    --include-function ts_query_cursor_set_containing_byte_range `
+    --include-function ts_query_cursor_set_containing_point_range `
     --include-function ts_query_cursor_set_match_limit `
     --include-function ts_query_cursor_set_max_start_depth `
     --include-function ts_query_cursor_set_point_range `
-    --include-function ts_query_cursor_set_timeout_micros `
-    --include-function ts_query_cursor_timeout_micros `
     --include-function ts_query_delete `
     --include-function ts_query_disable_capture `
     --include-function ts_query_disable_pattern `
@@ -139,6 +136,7 @@ $lib = "$($args[0])/core/lib"
     --include-function ts_query_start_byte_for_pattern `
     --include-function ts_query_string_count `
     --include-function ts_query_string_value_for_id `
+    --include-function ts_range_edit `
     --include-function ts_tree_copy `
     --include-function ts_tree_cursor_copy `
     --include-function ts_tree_cursor_current_depth `
@@ -193,7 +191,7 @@ $lib = "$($args[0])/core/lib"
     --include-constant TSSymbolTypeAuxiliary `
     --include-constant TSSymbolTypeRegular `
     --include-constant TSSymbolTypeSupertype `
-    --include-typedef DecodeFunction `
+    --include-typedef TSDecodeFunction `
     --header-class-name TreeSitter `
     --output $output `
     -t $package `

scripts/jextract.ps1

@@ -92,7 +92,6 @@ exec jextract \
     --include-function ts_node_string \
     --include-function ts_node_symbol \
     --include-function ts_node_type \
-    --include-function ts_parser_cancellation_flag \
     --include-function ts_parser_delete \
     --include-function ts_parser_included_ranges \
     --include-function ts_parser_language \
@@ -104,12 +103,10 @@ exec jextract \
     --include-function ts_parser_parse_with_options \
     --include-function ts_parser_print_dot_graphs \
     --include-function ts_parser_reset \
-    --include-function ts_parser_set_cancellation_flag \
     --include-function ts_parser_set_included_ranges \
     --include-function ts_parser_set_language \
     --include-function ts_parser_set_logger \
-    --include-function ts_parser_set_timeout_micros \
-    --include-function ts_parser_timeout_micros \
+    --include-function ts_point_edit \
     --include-function ts_query_capture_count \
     --include-function ts_query_capture_name_for_id \
     --include-function ts_query_capture_quantifier_for_id \
@@ -123,11 +120,11 @@ exec jextract \
     --include-function ts_query_cursor_next_match \
     --include-function ts_query_cursor_remove_match \
     --include-function ts_query_cursor_set_byte_range \
+    --include-function ts_query_cursor_set_containing_byte_range \
+    --include-function ts_query_cursor_set_containing_point_range \
     --include-function ts_query_cursor_set_match_limit \
     --include-function ts_query_cursor_set_max_start_depth \
     --include-function ts_query_cursor_set_point_range \
-    --include-function ts_query_cursor_set_timeout_micros \
-    --include-function ts_query_cursor_timeout_micros \
     --include-function ts_query_delete \
     --include-function ts_query_disable_capture \
     --include-function ts_query_disable_pattern \
@@ -141,6 +138,7 @@ exec jextract \
     --include-function ts_query_start_byte_for_pattern \
     --include-function ts_query_string_count \
     --include-function ts_query_string_value_for_id \
+    --include-function ts_range_edit \
     --include-function ts_tree_copy \
     --include-function ts_tree_cursor_copy \
     --include-function ts_tree_cursor_current_depth \
@@ -195,7 +193,7 @@ exec jextract \
     --include-constant TSSymbolTypeAuxiliary \
     --include-constant TSSymbolTypeRegular \
     --include-constant TSSymbolTypeSupertype \
-    --include-typedef DecodeFunction \
+    --include-typedef TSDecodeFunction \
     --header-class-name TreeSitter \
     --output "$output" \
     -t "$package" \

scripts/jextract.sh

@@ -9,7 +9,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Predicate;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
@@ -52,30 +51,6 @@ public Parser setLanguage(Language language) {
         return this;
     }
 
-    /**
-     * Get the maximum duration in microseconds that
-     * parsing should be allowed to take before halting.
-     *
-     * @deprecated Use {@link Options} instead.
-     */
-    @Deprecated(since = "0.25.0")
-    public @Unsigned long getTimeoutMicros() {
-        return ts_parser_timeout_micros(self);
-    }
-
-    /**
-     * Set the maximum duration in microseconds that
-     * parsing should be allowed to take before halting.
-     *
-     * @deprecated Use {@link Options} instead.
-     */
-    @Deprecated(since = "0.25.0")
-    @SuppressWarnings("DeprecatedIsStillUsed")
-    public Parser setTimeoutMicros(@Unsigned long timeoutMicros) {
-        ts_parser_set_timeout_micros(self, timeoutMicros);
-        return this;
-    }
-
     /**
      * Set the logger that the parser will use during parsing.
      *
@@ -108,21 +83,6 @@ public Parser setLogger(@Nullable Logger logger) {
         return this;
     }
 
-    /**
-     * Set the parser's current cancellation flag.
-     *
-     * <p>The parser will periodically read from this flag during parsing.
-     * If it reads a non-zero value, it will halt early.
-     *
-     * @deprecated Use {@link Options} instead.
-     */
-    @Deprecated(since = "0.25.0")
-    @SuppressWarnings("DeprecatedIsStillUsed")
-    public synchronized Parser setCancellationFlag(CancellationFlag cancellationFlag) {
-        ts_parser_set_cancellation_flag(self, cancellationFlag.segment);
-        return this;
-    }
-
     /**
      * Get the ranges of text that the parser should include when parsing.
      *
@@ -411,31 +371,4 @@ private boolean progressCallback(State state) {
             return progressCallback.test(state);
         }
     }
-
-    /**
-     * A class representing a cancellation flag.
-     *
-     * @deprecated Use {@link Options} instead.
-     */
-    @Deprecated(since = "0.25.0")
-    @SuppressWarnings("DeprecatedIsStillUsed")
-    public static class CancellationFlag {
-        private final Arena arena = Arena.ofAuto();
-        private final MemorySegment segment = arena.allocate(C_LONG_LONG);
-        private final AtomicLong value = new AtomicLong();
-
-        /** Creates an uninitialized cancellation flag. */
-        public CancellationFlag() {}
-
-        /** Get the value of the flag. */
-        public long get() {
-            return value.get();
-        }
-
-        /** Set the value of the flag. */
-        @SuppressWarnings("unused")
-        public void set(long value) {
-            segment.set(C_LONG_LONG, 0L, this.value.updateAndGet(_ -> value));
-        }
-    }
 }

src/main/java/io/github/treesitter/jtreesitter/Parser.java

@@ -1,6 +1,9 @@
 package io.github.treesitter.jtreesitter;
 
+import static io.github.treesitter.jtreesitter.internal.TreeSitter.*;
+
 import io.github.treesitter.jtreesitter.internal.TSPoint;
+import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 import java.lang.foreign.SegmentAllocator;
 
@@ -35,6 +38,23 @@ public int compareTo(Point other) {
         return Integer.compareUnsigned(column, other.column);
     }
 
+    /**
+     * Edit the point to keep it in-sync with source code that has been edited.
+     *
+     * <p>This function updates the point's byte offset and row/column position based on an edit
+     * operation. This is useful for editing points without requiring a tree or node instance.
+     *
+     * @return The new start byte of the point.
+     * @since 0.26.0
+     */
+    public @Unsigned int edit(InputEdit edit) {
+        try (var alloc = Arena.ofConfined()) {
+            var start_byte = alloc.allocate(C_INT.byteSize(), C_INT.byteAlignment());
+            ts_point_edit(into(alloc), start_byte, edit.into(alloc));
+            return start_byte.get(C_INT, 0);
+        }
+    }
+
     @Override
     public String toString() {
         return "Point[row=%s, column=%s]".formatted(Integer.toUnsignedString(row), Integer.toUnsignedString(column));

src/main/java/io/github/treesitter/jtreesitter/Point.java

@@ -55,31 +55,6 @@ public QueryCursor setMatchLimit(@Unsigned int matchLimit) throws IllegalArgumen
         return this;
     }
 
-    /**
-     * Get the maximum duration in microseconds that query
-     * execution should be allowed to take before halting.
-     *
-     * @apiNote Defaults to {@code 0} (unlimited).
-     *
-     * @deprecated Use {@link Options} instead.
-     */
-    @Deprecated(since = "0.25.0")
-    public @Unsigned long getTimeoutMicros() {
-        return ts_query_cursor_timeout_micros(self);
-    }
-
-    /**
-     * Set the maximum duration in microseconds that query
-     * execution should be allowed to take before halting.
-     *
-     * @deprecated Use {@link Options} instead.
-     */
-    @Deprecated(since = "0.25.0")
-    public QueryCursor setTimeoutMicros(@Unsigned long timeoutMicros) {
-        ts_query_cursor_set_timeout_micros(self, timeoutMicros);
-        return this;
-    }
-
     /**
      * Set the maximum start depth for the query.
      *
@@ -93,6 +68,7 @@ public QueryCursor setMaxStartDepth(@Unsigned int maxStartDepth) {
 
     /**
      * Set the range of bytes in which the query will be executed.
+     *
      * <p>The query cursor will return matches that intersect with the given range.
      * This means that a match may be returned even if some of its captures fall
      * outside the specified range, as long as at least part of the match
@@ -111,6 +87,25 @@ public QueryCursor setByteRange(@Unsigned int startByte, @Unsigned int endByte)
         return this;
     }
 
+    /**
+     * Set the byte range within which all matches must be fully contained.
+     *
+     * <p>In contrast to {@link #setByteRange(int, int)}, this will restrict the query cursor
+     * to only return matches where <em>all</em> nodes are <em>fully</em> contained within
+     * the given range. Both functions can be used together, e.g. to search for any matches
+     * that intersect line 5000, as long as they are fully contained within lines 4500-5500.
+     *
+     * @throws IllegalArgumentException If {@code endByte > startByte}.
+     * @since 0.26.0
+     */
+    public QueryCursor setContainingByteRange(@Unsigned int startByte, @Unsigned int endByte)
+            throws IllegalArgumentException {
+        if (!ts_query_cursor_set_containing_byte_range(self, startByte, endByte)) {
+            throw new IllegalArgumentException("Invalid byte range");
+        }
+        return this;
+    }
+
     /**
      * Set the range of points in which the query will be executed.
      *
@@ -135,6 +130,27 @@ public QueryCursor setPointRange(Point startPoint, Point endPoint) throws Illega
         return this;
     }
 
+    /**
+     * Set the point range within which all matches must be fully contained.
+     *
+     * <p>In contrast to {@link #setPointRange(Point, Point)}, this will restrict the query cursor
+     * to only return matches where <em>all</em> nodes are <em>fully</em> contained within
+     * the given range. Both functions can be used together, e.g. to search for any matches
+     * that intersect line 5000, as long as they are fully contained within lines 4500-5500.
+     *
+     * @throws IllegalArgumentException If {@code endPoint > startPoint}.
+     * @since 0.26.0
+     */
+    public QueryCursor setContainingPointRange(Point startPoint, Point endPoint) throws IllegalArgumentException {
+        try (var alloc = Arena.ofConfined()) {
+            MemorySegment start = startPoint.into(alloc), end = endPoint.into(alloc);
+            if (!ts_query_cursor_set_containing_point_range(self, start, end)) {
+                throw new IllegalArgumentException("Invalid point range");
+            }
+        }
+        return this;
+    }
+
     /**
      * Check if the query exceeded its maximum number of
      * in-progress matches during its last execution.
@@ -298,14 +314,21 @@ public static class Options {
         private final @Nullable Predicate<State> progressCallback;
         private final @Nullable BiPredicate<QueryPredicate, QueryMatch> predicateCallback;
 
+        /**
+         * @since 0.26.0
+         */
+        public Options() {
+            this.progressCallback = null;
+            this.predicateCallback = null;
+        }
+
         /**
          * @param progressCallback Progress handler. Return {@code true} to cancel query execution,
          *                         {@code false} to continue query execution.
          * @param predicateCallback Custom predicate handler.
+         * @since 0.26.0
          */
-        public Options(
-                @Nullable Predicate<State> progressCallback,
-                @Nullable BiPredicate<QueryPredicate, QueryMatch> predicateCallback) {
+        public Options(Predicate<State> progressCallback, BiPredicate<QueryPredicate, QueryMatch> predicateCallback) {
             this.progressCallback = progressCallback;
             this.predicateCallback = predicateCallback;
         }

src/main/java/io/github/treesitter/jtreesitter/QueryCursor.java

@@ -1,6 +1,9 @@
 package io.github.treesitter.jtreesitter;
 
+import static io.github.treesitter.jtreesitter.internal.TreeSitter.*;
+
 import io.github.treesitter.jtreesitter.internal.TSRange;
+import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 import java.lang.foreign.SegmentAllocator;
 import org.jspecify.annotations.NullMarked;
@@ -44,6 +47,20 @@ MemorySegment into(SegmentAllocator allocator) {
         return range;
     }
 
+    /**
+     * Edit the range to keep it in-sync with source code that has been edited.
+     *
+     * <p>This function updates the range's byte offset and row/column position based on an edit
+     * operation. This is useful for editing ranges without requiring a tree or node instance.
+     *
+     * @since 0.26.0
+     */
+    public void edit(InputEdit edit) {
+        try (var alloc = Arena.ofConfined()) {
+            ts_range_edit(into(alloc), edit.into(alloc));
+        }
+    }
+
     @Override
     public String toString() {
         return String.format(