ruby_tree_sitter 2.0.0-arm64-darwin → 2.1.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 762e85c03b1ac0aff82accdabde06c3bdce317f407618b372472c19a4c4d0e9f
-  data.tar.gz: 053c98c04d1f4b7bb9b9f4ee1c6cfa5b78e2b0fd286033747bf40584b5a80b67
+  metadata.gz: 7b7c4451a5742fa58563957e313101cd381bc6a09e6f21fd976dde4b72916fc1
+  data.tar.gz: 1aca7f12a7e13ef674b1d36a2f7d6e174ca5c523c2b9ff958280caa6ca0c848c
 SHA512:
-  metadata.gz: bcb0cf7c31580f0b57dc7f4a6d244beff6b8ea7b2217cc79c9f65bfd82859d3a8ae983488170e7c651bf125f8f4f7100aaae130b3fbf2469c40eef22155a62db
-  data.tar.gz: 791a4a64e943acfbe06cce027008da67f223cff1aa3cb1ce63d11e39088804f31718c8b6f8aa73db99f750b4274ecc79ff55fca7f948442ce9d7d1ef2fe0f1ad
+  metadata.gz: 03d4c5b4a3ff7b3fc66936aba365a37baacf72712c544e09afd61846ca9ab75930b0868b4e1ec2cfab15deb5c96a73bf15e4189d74cd03b5bf8a26c961705bd7
+  data.tar.gz: af72e5c01c65ee780a0adcd44e4b25dcedab27d5c85f097665fcc812e8e80ebdab93e9928bc8b7db5feac95686581e897d34568d82cb554617307bd05b74b8f4

data/ext/tree_sitter/encoding.c

@@ -14,7 +14,8 @@ TSInputEncoding value_to_encoding(VALUE encoding) {
 
   // NOTE: should we emit a warning instead of defaulting to UTF8?
   if (enc == u16) {
-    return TSInputEncodingUTF16;
+    // tree-sitter 0.26+ split UTF16 into UTF16LE and UTF16BE
+    return TSInputEncodingUTF16LE;
   } else {
     return TSInputEncodingUTF8;
   }

data/ext/tree_sitter/extconf.rb

@@ -121,25 +121,27 @@ if sanitizers
     $warnflags.gsub!(/#{r}/, '')
   end
 
-  cflags.concat %W[
-    -fms-extensions
-    -fdeclspec
-    -fsanitize=#{sanitizers}
-    -fsanitize-blacklist=../../../../.asanignore
-    -fsanitize-recover=#{sanitizers}
-    -fno-sanitize-recover=all
-    -fno-sanitize=null
-    -fno-sanitize=alignment
-    -fno-omit-frame-pointer
-  ]
-
-  ldflags.concat %W[
-    -fsanitize=#{sanitizers}
-    -dynamic-libasan
-  ]
+  cflags.push(*
+    %W[
+      -fms-extensions
+      -fdeclspec
+      -fsanitize=#{sanitizers}
+      -fsanitize-blacklist=../../../../.asanignore
+      -fsanitize-recover=#{sanitizers}
+      -fno-sanitize-recover=all
+      -fno-sanitize=null
+      -fno-sanitize=alignment
+      -fno-omit-frame-pointer
+    ])
+
+  ldflags.push(*
+    %W[
+      -fsanitize=#{sanitizers}
+      -dynamic-libasan
+    ])
 end
 
-cflags.concat %w[-std=c99 -fPIC -Wall]
+cflags.push(*%w[-std=c99 -fPIC -Wall])
 
 append_cflags(cflags)
 append_ldflags(ldflags)

data/ext/tree_sitter/language.c

@@ -3,7 +3,8 @@
 #include <stdint.h>
 #include <stdio.h>
 
-typedef TSLanguage *(tree_sitter_lang)(void);
+// tree-sitter 0.26+ returns const TSLanguage*
+typedef const TSLanguage *(tree_sitter_lang)(void);
 const char *tree_sitter_prefix = "tree_sitter_";
 
 extern VALUE mTreeSitter;
@@ -40,26 +41,32 @@ static VALUE language_load(VALUE self, VALUE name, VALUE path) {
   VALUE path_s = rb_funcall(path, rb_intern("to_s"), 0);
   char *path_cstr = StringValueCStr(path_s);
   void *lib = dlopen(path_cstr, RTLD_NOW);
-  const char *err = dlerror();
-  if (err != NULL) {
+  if (lib == NULL) {
+    const char *err = dlerror();
     VALUE parser_not_found = rb_const_get(mTreeSitter, rb_intern("ParserNotFoundError"));
     rb_raise(parser_not_found,
-             "Could not load shared library `%s'.\nReason: %s", path_cstr, err);
+             "Could not load shared library `%s'.\nReason: %s", path_cstr, err ? err : "unknown error");
   }
 
-  char buf[256];
-  snprintf(buf, sizeof(buf), "tree_sitter_%s", StringValueCStr(name));
+  VALUE symbol_name = rb_sprintf("tree_sitter_%s", StringValueCStr(name));
+  char *buf = StringValueCStr(symbol_name);
+
+  // Clear any previous error before dlsym (POSIX requirement)
+  dlerror();
+
   tree_sitter_lang *make_ts_language = dlsym(lib, buf);
-  err = dlerror();
-  if (err != NULL) {
+
+  // Only check dlerror if dlsym returned NULL
+  if (make_ts_language == NULL) {
+    const char *err = dlerror();
     dlclose(lib);
     VALUE symbol_not_found = rb_const_get(mTreeSitter, rb_intern("SymbolNotFoundError"));
     rb_raise(symbol_not_found,
-             "Could not load symbol `%s' from library `%s'.\nReason:%s",
-             StringValueCStr(name), path_cstr, err);
+             "Could not load symbol `%s' from library `%s'.\nReason: %s",
+             buf, path_cstr, err ? err : "symbol not found");
   }
 
-  TSLanguage *lang = make_ts_language();
+  const TSLanguage *lang = make_ts_language();
   if (lang == NULL) {
     dlclose(lib);
     VALUE language_load_error = rb_const_get(mTreeSitter, rb_intern("LanguageLoadError"));
@@ -69,7 +76,8 @@ static VALUE language_load(VALUE self, VALUE name, VALUE path) {
              StringValueCStr(name), path_cstr);
   }
 
-  uint32_t version = ts_language_version(lang);
+  // tree-sitter 0.26+ renamed ts_language_version to ts_language_abi_version
+  uint32_t version = ts_language_abi_version(lang);
   if (version < TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION) {
     VALUE version_error = rb_const_get(mTreeSitter, rb_intern("ParserVersionError"));
     rb_raise(version_error,
@@ -194,7 +202,8 @@ static VALUE language_symbol_type(VALUE self, VALUE symbol) {
  * @see Parser#language=
  */
 static VALUE language_version(VALUE self) {
-  return UINT2NUM(ts_language_version(SELF));
+  // tree-sitter 0.26+ renamed ts_language_version to ts_language_abi_version
+  return UINT2NUM(ts_language_abi_version(SELF));
 }
 
 void init_language(void) {
@@ -220,4 +229,5 @@ void init_language(void) {
   rb_define_method(cLanguage, "symbol_name", language_symbol_name, 1);
   rb_define_method(cLanguage, "symbol_type", language_symbol_type, 1);
   rb_define_method(cLanguage, "version", language_version, 0);
+  rb_define_method(cLanguage, "abi_version", language_version, 0);
 }

data/ext/tree_sitter/parser.c

@@ -7,6 +7,7 @@ VALUE cParser;
 typedef struct {
   TSParser *data;
   size_t cancellation_flag;
+  VALUE logger;
 } parser_t;
 
 static void parser_free(void *ptr) {
@@ -19,14 +20,24 @@ static size_t parser_memsize(const void *ptr) {
   return sizeof(type);
 }
 
+static void parser_mark(void *ptr) {
+  parser_t *parser = (parser_t *)ptr;
+  rb_gc_mark_movable(parser->logger);
+}
+
+static void parser_compact(void *ptr) {
+  parser_t *parser = (parser_t *)ptr;
+  parser->logger = rb_gc_location(parser->logger);
+}
+
 const rb_data_type_t parser_data_type = {
     .wrap_struct_name = "parser",
     .function =
         {
-            .dmark = NULL,
+            .dmark = parser_mark,
             .dfree = parser_free,
             .dsize = parser_memsize,
-            .dcompact = NULL,
+            .dcompact = parser_compact,
         },
     .flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
@@ -37,6 +48,7 @@ static VALUE parser_allocate(VALUE klass) {
   parser_t *parser;
   VALUE res = TypedData_Make_Struct(klass, parser_t, &parser_data_type, parser);
   parser->data = ts_parser_new();
+  parser->logger = Qnil;
   return res;
 }
 
@@ -44,9 +56,14 @@ static VALUE parser_allocate(VALUE klass) {
  * Get the parser's current cancellation flag pointer.
  *
  * @return [Integer]
+ *
+ * @note DEPRECATED in tree-sitter 0.26+. This API was removed.
+ *       Use TSParseOptions with progress_callback instead.
  */
 static VALUE parser_get_cancellation_flag(VALUE self) {
-  return SIZET2NUM(*ts_parser_cancellation_flag(SELF));
+  // tree-sitter 0.26+ removed cancellation_flag API
+  // Return the stored value for backward compatibility
+  return SIZET2NUM(unwrap(self)->cancellation_flag);
 }
 
 /**
@@ -58,13 +75,15 @@ static VALUE parser_get_cancellation_flag(VALUE self) {
  *
  * @see parse
  *
- * @note This is not well-tested in the bindings.
+ * @note DEPRECATED in tree-sitter 0.26+. This API was removed.
+ *       Use TSParseOptions with progress_callback instead.
  *
  * @return nil
  */
 static VALUE parser_set_cancellation_flag(VALUE self, VALUE flag) {
+  // tree-sitter 0.26+ removed cancellation_flag API
+  // Store the value for backward compatibility but it won't affect parsing
   unwrap(self)->cancellation_flag = NUM2SIZET(flag);
-  ts_parser_set_cancellation_flag(SELF, &unwrap(self)->cancellation_flag);
   return Qnil;
 }
 
@@ -171,6 +190,7 @@ static VALUE parser_get_logger(VALUE self) {
  */
 static VALUE parser_set_logger(VALUE self, VALUE logger) {
   ts_parser_set_logger(SELF, value_to_logger(logger));
+  unwrap(self)->logger = logger;
   return Qnil;
 }
 
@@ -345,32 +365,6 @@ static VALUE parser_reset(VALUE self) {
   return Qnil;
 }
 
-/**
- * Get the duration in microseconds that parsing is allowed to take.
- *
- * @return [Integer]
- */
-static VALUE parser_get_timeout_micros(VALUE self) {
-  return ULL2NUM(ts_parser_timeout_micros(SELF));
-}
-
-/**
- * Set the maximum duration in microseconds that parsing should be allowed to
- * take before halting.
- *
- * If parsing takes longer than this, it will halt early, returning +nil+.
- *
- * @see parse
- *
- * @param timeout [Integer]
- *
- * @return [nil]
- */
-static VALUE parser_set_timeout_micros(VALUE self, VALUE timeout) {
-  ts_parser_set_timeout_micros(SELF, NUM2ULL(timeout));
-  return Qnil;
-}
-
 void init_parser(void) {
   cParser = rb_define_class_under(mTreeSitter, "Parser", rb_cObject);
 
@@ -393,6 +387,4 @@ void init_parser(void) {
                    parser_parse_string_encoding, 3);
   rb_define_method(cParser, "print_dot_graphs", parser_print_dot_graphs, 1);
   rb_define_method(cParser, "reset", parser_reset, 0);
-  rb_define_method(cParser, "timeout_micros", parser_get_timeout_micros, 0);
-  rb_define_method(cParser, "timeout_micros=", parser_set_timeout_micros, 1);
 }

data/ext/tree_sitter/query_cursor.c

@@ -204,10 +204,9 @@ void init_query_cursor(void) {
 
   rb_define_alloc_func(cQueryCursor, query_cursor_allocate);
 
-  /* Module methods */
-  rb_define_module_function(cQueryCursor, "exec", query_cursor_exec_static, 2);
-
   /* Class methods */
+  rb_define_singleton_method(cQueryCursor, "exec", query_cursor_exec_static, 2);
+
   // Accessors
   DECLARE_ACCESSOR(cQueryCursor, query_cursor, match_limit)
 
@@ -215,10 +214,6 @@ void init_query_cursor(void) {
   rb_define_method(cQueryCursor, "exec", query_cursor_exec, 2);
   rb_define_method(cQueryCursor, "exceed_match_limit?",
                    query_cursor_did_exceed_match_limit, 0);
-  rb_define_method(cQueryCursor, "match_limit", query_cursor_get_match_limit,
-                   0);
-  rb_define_method(cQueryCursor, "match_limit=", query_cursor_set_match_limit,
-                   1);
   rb_define_method(cQueryCursor,
                    "max_start_depth=", query_cursor_set_max_start_depth, 1);
   rb_define_method(cQueryCursor, "next_capture", query_cursor_next_capture, 0);

data/ext/tree_sitter/repo.rb

@@ -39,7 +39,7 @@ module TreeSitter
     end
 
     def extract?
-      !exe.filter { |k, v| %i[tar zip].include?(k) && v }.empty?
+      exe.any? { |k, v| %i[tar zip].include?(k) && v }
     end
 
     def download
@@ -50,7 +50,7 @@ module TreeSitter
       %w[git curl wget].each do |cmd|
         res =
           if find_executable(cmd)
-            send("sources_from_#{cmd}")
+            send("sources_from_#{cmd}?")
           else
             false
           end
@@ -76,7 +76,7 @@ module TreeSitter
       MSG
     end
 
-    def sources_from_curl
+    def sources_from_curl?
       return false if !exe?(:curl) || !extract?
 
       if exe?(:tar)
@@ -90,7 +90,7 @@ module TreeSitter
       true
     end
 
-    def sources_from_git
+    def sources_from_git?
       return false if !exe?(:git)
 
       sh <<~SHELL.chomp
@@ -104,7 +104,7 @@ module TreeSitter
       true
     end
 
-    def sources_from_wget
+    def sources_from_wget?
       return false if !exe?(:wget) || !extract?
 
       if exe?(:tar)

data/lib/tree_sitter/query.rb

@@ -45,11 +45,7 @@ module TreeSitter
       pattern_count.times do |i| # rubocop:disable Metrics/BlockLength
         predicate_steps = predicates_for_pattern(i)
         byte_offset = start_byte_for_pattern(i)
-        row =
-          source.chars.map.with_index
-            .take_while { |_, i| i < byte_offset } # rubocop:disable Lint/ShadowingOuterLocalVariable
-            .filter { |c, _| c == "\n" }
-            .size
+        row = source[0...byte_offset].count("\n")
         text_predicates = []
         property_predicates = []
         property_settings = []

data/lib/tree_sitter/version.rb

@@ -2,7 +2,7 @@
 
 module TreeSitter
   # The version of the tree-sitter library.
-  TREESITTER_VERSION = '0.24.7'
+  TREESITTER_VERSION = '0.26.5'
   # The current version of the gem.
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/lib/tree_sitter.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'set'
-
 begin
   RUBY_VERSION =~ /(\d+\.\d+)/
   require "tree_sitter/#{Regexp.last_match(1)}/tree_sitter"

data/tree_sitter.gemspec

@@ -6,7 +6,7 @@ $LOAD_PATH.unshift(lib) if !$LOAD_PATH.include?(lib)
 require 'tree_sitter/version'
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = Gem::Requirement.new('>= 3.1.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.2.0')
 
   spec.authors       = ['Firas al-Khalil', 'Derek Stride']
   spec.email         = ['firasalkhalil@gmail.com', 'derek@stride.host']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_tree_sitter
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: arm64-darwin
 authors:
 - Firas al-Khalil
 - Derek Stride
 bindir: exe
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oppen
@@ -56,8 +56,8 @@ email:
 - firasalkhalil@gmail.com
 - derek@stride.host
 executables:
-- rbts
 - print_matches
+- rbts
 extensions: []
 extra_rdoc_files: []
 files:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Ruby bindings for Tree-Sitter
 test_files: []