tree_haver 5.0.5 → 7.1.0

data/lib/tree_haver/library_path_utils.rb

@@ -33,21 +33,21 @@ module TreeHaver
       return unless path
 
       # Extract filename without extension: "libtree-sitter-toml" or "toml"
-      filename = File.basename(path, ".*")
+      filename = File.basename(path, '.*')
 
       # Handle multi-part extensions like .so.0.24
-      filename = filename.sub(/\.so(\.\d+)*\z/, "")
+      filename = filename.sub(/\.so(\.\d+)*\z/, '')
 
       # Match patterns and normalize to tree_sitter_<lang>
       case filename
       when /\Alib[-_]?tree[-_]sitter[-_](.+)\z/
-        "tree_sitter_#{Regexp.last_match(1).tr("-", "_")}"
+        "tree_sitter_#{Regexp.last_match(1).tr('-', '_')}"
       when /\Atree[-_]sitter[-_](.+)\z/
-        "tree_sitter_#{Regexp.last_match(1).tr("-", "_")}"
+        "tree_sitter_#{Regexp.last_match(1).tr('-', '_')}"
       else
         # Assume filename is just the language name (e.g., "toml.so" -> "tree_sitter_toml")
         # Also strip "lib" prefix if present (e.g., "libtoml.so" -> "tree_sitter_toml")
-        lang = filename.sub(/\Alib/, "").tr("-", "_")
+        lang = filename.sub(/\Alib/, '').tr('-', '_')
         "tree_sitter_#{lang}"
       end
     end
@@ -64,7 +64,7 @@ module TreeHaver
       return unless symbol
 
       # Strip the "tree_sitter_" prefix to get the language name
-      symbol.sub(/\Atree_sitter_/, "")
+      symbol.sub(/\Atree_sitter_/, '')
     end
 
     # Derive language name from a symbol
@@ -74,7 +74,7 @@ module TreeHaver
     def derive_language_name_from_symbol(symbol)
       return unless symbol
 
-      symbol.sub(/\Atree_sitter_/, "")
+      symbol.sub(/\Atree_sitter_/, '')
     end
   end
 end

data/lib/tree_haver/node.rb

@@ -106,7 +106,7 @@ module TreeHaver
       elsif @inner_node.respond_to?(:kind)
         @inner_node.kind.to_s
       else
-        raise TreeHaver::Error, "Backend node does not support type/kind"
+        raise TreeHaver::Error, 'Backend node does not support type/kind'
       end
     end
 
@@ -151,7 +151,7 @@ module TreeHaver
           Point.new(point.row, point.column)
         end
       else
-        raise TreeHaver::Error, "Backend node does not support start_point/start_position"
+        raise TreeHaver::Error, 'Backend node does not support start_point/start_position'
       end
     end
 
@@ -176,7 +176,7 @@ module TreeHaver
           Point.new(point.row, point.column)
         end
       else
-        raise TreeHaver::Error, "Backend node does not support end_point/end_position"
+        raise TreeHaver::Error, 'Backend node does not support end_point/end_position'
       end
     end
 
@@ -213,7 +213,7 @@ module TreeHaver
         start_line: start_line,
         end_line: end_line,
         start_column: start_point.column,
-        end_column: end_point.column,
+        end_column: end_point.column
       }
     end
 
@@ -234,7 +234,7 @@ module TreeHaver
         # Some backends (like TreeStump) require source as argument
         # Check arity to determine how to call
         arity = @inner_node.method(:text).arity
-        if arity == 0 || arity == -1
+        if [0, -1].include?(arity)
           # No required arguments, or optional arguments only
           @inner_node.text
         elsif arity >= 1 && @source
@@ -242,15 +242,15 @@ module TreeHaver
           @inner_node.text(@source)
         elsif @source
           # Fallback to byte extraction
-          @source[start_byte...end_byte] || ""
+          @source[start_byte...end_byte] || ''
         else
-          raise TreeHaver::Error, "Cannot extract text: backend requires source but none provided"
+          raise TreeHaver::Error, 'Cannot extract text: backend requires source but none provided'
         end
       elsif @source
         # Fallback: extract from source using byte positions
-        @source[start_byte...end_byte] || ""
+        @source[start_byte...end_byte] || ''
       else
-        raise TreeHaver::Error, "Cannot extract text: node has no text method and no source provided"
+        raise TreeHaver::Error, 'Cannot extract text: node has no text method and no source provided'
       end
     end
 
@@ -311,6 +311,7 @@ module TreeHaver
     def child(index)
       child_node = @inner_node.child(index)
       return if child_node.nil?
+
       Node.new(child_node, source: @source)
     rescue IndexError
       # Some backends (e.g., MRI w/ ruby_tree_sitter) raise IndexError for out of bounds
@@ -329,6 +330,7 @@ module TreeHaver
       if @inner_node.respond_to?(:named_child)
         child_node = @inner_node.named_child(index)
         return if child_node.nil?
+
         return Node.new(child_node, source: @source)
       end
 
@@ -340,20 +342,20 @@ module TreeHaver
 
         # Check if this child is named
         is_named = if child_node.respond_to?(:named?)
-          child_node.named?
-        elsif child_node.respond_to?(:is_named?)
-          child_node.is_named?
-        else
-          true  # Assume named if we can't determine
-        end
+                     child_node.named?
+                   elsif child_node.respond_to?(:is_named?)
+                     child_node.is_named?
+                   else
+                     true # Assume named if we can't determine
+                   end
 
-        if is_named
-          return Node.new(child_node, source: @source) if named_count == index
-          named_count += 1
-        end
+        next unless is_named
+        return Node.new(child_node, source: @source) if named_count == index
+
+        named_count += 1
       end
 
-      nil  # Index out of bounds
+      nil # Index out of bounds
     end
 
     # Get the count of named children
@@ -363,9 +365,7 @@ module TreeHaver
     # @return [Integer] Number of named children
     def named_child_count
       # Try native implementation first
-      if @inner_node.respond_to?(:named_child_count)
-        return @inner_node.named_child_count
-      end
+      return @inner_node.named_child_count if @inner_node.respond_to?(:named_child_count)
 
       # Fallback: count named children manually
       count = 0
@@ -375,12 +375,12 @@ module TreeHaver
 
         # Check if this child is named
         is_named = if child_node.respond_to?(:named?)
-          child_node.named?
-        elsif child_node.respond_to?(:is_named?)
-          child_node.is_named?
-        else
-          true  # Assume named if we can't determine
-        end
+                     child_node.named?
+                   elsif child_node.respond_to?(:is_named?)
+                     child_node.is_named?
+                   else
+                     true # Assume named if we can't determine
+                   end
 
         count += 1 if is_named
       end
@@ -408,6 +408,7 @@ module TreeHaver
     # @return [Enumerator, nil]
     def each(&block)
       return to_enum(__method__) unless block_given?
+
       children.each(&block)
     end
 
@@ -419,6 +420,7 @@ module TreeHaver
       if @inner_node.respond_to?(:child_by_field_name)
         child_node = @inner_node.child_by_field_name(name.to_s)
         return if child_node.nil?
+
         Node.new(child_node, source: @source)
       else
         # Not all backends support field names
@@ -427,15 +429,17 @@ module TreeHaver
     end
 
     # Alias for child_by_field_name
-    alias_method :field, :child_by_field_name
+    alias field child_by_field_name
 
     # Get the parent node
     #
     # @return [Node, nil] The parent node
     def parent
       return unless @inner_node.respond_to?(:parent)
+
       parent_node = @inner_node.parent
       return if parent_node.nil?
+
       Node.new(parent_node, source: @source)
     end
 
@@ -444,8 +448,10 @@ module TreeHaver
     # @return [Node, nil]
     def next_sibling
       return unless @inner_node.respond_to?(:next_sibling)
+
       sibling = @inner_node.next_sibling
       return if sibling.nil?
+
       Node.new(sibling, source: @source)
     end
 
@@ -454,8 +460,10 @@ module TreeHaver
     # @return [Node, nil]
     def prev_sibling
       return unless @inner_node.respond_to?(:prev_sibling)
+
       sibling = @inner_node.prev_sibling
       return if sibling.nil?
+
       Node.new(sibling, source: @source)
     end
 
@@ -512,11 +520,12 @@ module TreeHaver
     # @return [Boolean] true if both nodes wrap the same inner_node
     def ==(other)
       return false unless other.is_a?(Node)
+
       @inner_node == other.inner_node
     end
 
     # Alias for == to support both styles
-    alias_method :eql?, :==
+    alias eql? ==
 
     # Generate hash value for this node
     #

data/lib/tree_haver/parser.rb

@@ -82,7 +82,7 @@ module TreeHaver
     # @example Explicit backend
     #   parser = TreeHaver::Parser.new(backend: :citrus)
     def initialize(backend: nil)
-      super()  # Initialize @language from Base::Parser
+      super() # Initialize @language from Base::Parser
 
       # Convert string backend names to symbols for consistency
       backend = backend.to_sym if backend.is_a?(String)
@@ -90,20 +90,19 @@ module TreeHaver
       mod = TreeHaver.resolve_backend_module(backend)
 
       if mod.nil?
-        if backend
-          raise NotAvailable, "Requested backend #{backend.inspect} is not available"
-        else
-          raise NotAvailable, "No TreeHaver backend is available"
-        end
+        raise NotAvailable, "Requested backend #{backend.inspect} is not available" if backend
+
+        raise NotAvailable, 'No TreeHaver backend is available'
+
       end
 
       # Try to create the parser, with fallback to pure Ruby if tree-sitter fails
       # This enables auto-fallback when tree-sitter runtime isn't available
       begin
         @impl = mod::Parser.new
-        @explicit_backend = backend  # Remember for introspection (always a Symbol or nil)
+        @explicit_backend = backend # Remember for introspection (always a Symbol or nil)
       rescue NoMethodError, LoadError => e
-        # Note: FFI::NotFoundError inherits from LoadError, so it's caught here too
+        # NOTE: FFI::NotFoundError inherits from LoadError, so it's caught here too
         handle_parser_creation_failure(e, backend)
       end
     end
@@ -117,22 +116,21 @@ module TreeHaver
     def handle_parser_creation_failure(error, backend)
       # Tree-sitter backend failed (likely missing runtime library)
       # Try Citrus or Parslet as fallback if we weren't explicitly asked for a specific backend
-      if backend.nil? || backend == :auto
-        if Backends::Citrus.available?
-          @impl = Backends::Citrus::Parser.new
-          @explicit_backend = :citrus
-        elsif Backends::Parslet.available?
-          @impl = Backends::Parslet::Parser.new
-          @explicit_backend = :parslet
-        else
-          # No fallback available, re-raise original error
-          raise NotAvailable, "Tree-sitter backend failed: #{error.message}. " \
-            "Citrus/Parslet fallback not available. Install tree-sitter runtime, citrus gem, or parslet gem."
-        end
+      raise error unless backend.nil? || backend == :auto
+
+      if Backends::Citrus.available?
+        @impl = Backends::Citrus::Parser.new
+        @explicit_backend = :citrus
+      elsif Backends::Parslet.available?
+        @impl = Backends::Parslet::Parser.new
+        @explicit_backend = :parslet
       else
-        # Explicit backend was requested, don't fallback
-        raise error
+        # No fallback available, re-raise original error
+        raise NotAvailable, "Tree-sitter backend failed: #{error.message}. " \
+          'Citrus/Parslet fallback not available. Install tree-sitter runtime, citrus gem, or parslet gem.'
       end
+
+      # Explicit backend was requested, don't fallback
     end
 
     # Get the backend this parser is using (for introspection)
@@ -234,20 +232,27 @@ module TreeHaver
     # @example First parse (no old tree)
     #   tree = parser.parse_string(nil, "x = 1")
     # @example Incremental parse
-    #   tree.edit(start_byte: 4, old_end_byte: 5, new_end_byte: 6, ...)
+    #   tree.edit(
+    #     start_byte: 4,
+    #     old_end_byte: 5,
+    #     new_end_byte: 6,
+    #     start_point: {row: 0, column: 4},
+    #     old_end_point: {row: 0, column: 5},
+    #     new_end_point: {row: 0, column: 6}
+    #   )
     #   new_tree = parser.parse_string(tree, "x = 42")
     def parse_string(old_tree, source)
       # Pass through to backend if it supports incremental parsing
       if old_tree && @impl.respond_to?(:parse_string)
         # Extract the underlying implementation from our Tree wrapper
         old_impl = if old_tree.respond_to?(:inner_tree)
-          old_tree.inner_tree
-        elsif old_tree.respond_to?(:instance_variable_get)
-          # Fallback for compatibility
-          old_tree.instance_variable_get(:@inner_tree) || old_tree.instance_variable_get(:@impl) || old_tree
-        else
-          old_tree
-        end
+                     old_tree.inner_tree
+                   elsif old_tree.respond_to?(:instance_variable_get)
+                     # Fallback for compatibility
+                     old_tree.instance_variable_get(:@inner_tree) || old_tree.instance_variable_get(:@impl) || old_tree
+                   else
+                     old_tree
+                   end
         tree_impl = @impl.parse_string(old_impl, source)
         # Wrap backend tree with source so Node#text works
         Tree.new(tree_impl, source: source)
@@ -335,9 +340,9 @@ module TreeHaver
           else
             # Couldn't reload - this is an error
             raise TreeHaver::Error,
-              "Language backend mismatch: language is for #{lang.backend}, parser is #{current_backend}. " \
-                "Cannot reload language for correct backend. " \
-                "Create a new language with TreeHaver::Language.from_library when backend is #{current_backend}."
+                  "Language backend mismatch: language is for #{lang.backend}, parser is #{current_backend}. " \
+                    'Cannot reload language for correct backend. ' \
+                    "Create a new language with TreeHaver::Language.from_library when backend is #{current_backend}."
           end
         end
 
@@ -358,17 +363,19 @@ module TreeHaver
         # This shouldn't happen - all our wrappers have backend attribute
         # If we get here, it's likely a raw backend object that was passed directly
         raise TreeHaver::Error,
-          "Expected TreeHaver Language wrapper with backend attribute, got #{lang.class}. " \
-            "Use TreeHaver::Language.from_library to create language objects."
+              "Expected TreeHaver Language wrapper with backend attribute, got #{lang.class}. " \
+                'Use TreeHaver::Language.from_library to create language objects.'
       end
 
       case lang.backend
       when :mri
         return lang.to_language if lang.respond_to?(:to_language)
         return lang.inner_language if lang.respond_to?(:inner_language)
+
         lang
       when :rust
         return lang.name if lang.respond_to?(:name)
+
         lang
       when :ffi
         lang  # FFI needs wrapper for to_ptr
@@ -422,9 +429,9 @@ module TreeHaver
           return Language.from_library(
             lang.path,
             symbol: lang.respond_to?(:symbol) ? lang.symbol : nil,
-            name: lang.respond_to?(:name) ? lang.name : nil,
+            name: lang.respond_to?(:name) ? lang.name : nil
           )
-        rescue => e
+        rescue StandardError => e
           # Reload failed, continue with original
           warn("TreeHaver: Failed to reload language for backend #{target_backend}: #{e.message}") if $VERBOSE
           return

data/lib/tree_haver/parslet_grammar_finder.rb

@@ -68,7 +68,7 @@ module TreeHaver
       return @available if @load_attempted
 
       @load_attempted = true
-      debug = ENV["TREE_HAVER_DEBUG"]
+      debug = ENV['TREE_HAVER_DEBUG']
 
       # Guard against nil require_path (can happen if gem_name was nil)
       if @require_path.nil? || @require_path.empty?
@@ -96,38 +96,34 @@ module TreeHaver
 
         @available = true
       rescue LoadError => e
-        # :nocov: defensive - requires gem to not be installed
+        # simplecov:disable defensive - requires gem to not be installed
         if debug
           warn("ParsletGrammarFinder: Failed to load '#{@require_path}': #{e.class}: #{e.message}")
           warn("ParsletGrammarFinder: LoadError backtrace:\n  #{e.backtrace&.first(10)&.join("\n  ")}")
         end
         @available = false
-        # :nocov:
+        # simplecov:enable
       rescue NameError => e
-        # :nocov: defensive - requires gem with missing constant
+        # simplecov:disable defensive - requires gem with missing constant
         if debug
           warn("ParsletGrammarFinder: Failed to resolve '#{@grammar_const}': #{e.class}: #{e.message}")
           warn("ParsletGrammarFinder: NameError backtrace:\n  #{e.backtrace&.first(10)&.join("\n  ")}")
         end
         @available = false
-        # :nocov:
+        # simplecov:enable
       rescue TypeError => e
-        # :nocov: defensive - TruffleRuby-specific edge case
+        # simplecov:disable defensive - TruffleRuby-specific edge case
         warn("ParsletGrammarFinder: TypeError during load of '#{@require_path}': #{e.class}: #{e.message}")
-        warn("ParsletGrammarFinder: This may be a TruffleRuby bundled_gems.rb issue")
-        if debug
-          warn("ParsletGrammarFinder: TypeError backtrace:\n  #{e.backtrace&.first(10)&.join("\n  ")}")
-        end
+        warn('ParsletGrammarFinder: This may be a TruffleRuby bundled_gems.rb issue')
+        warn("ParsletGrammarFinder: TypeError backtrace:\n  #{e.backtrace&.first(10)&.join("\n  ")}") if debug
         @available = false
-        # :nocov:
-      rescue => e
-        # :nocov: defensive - catch-all for unexpected errors
+        # simplecov:enable
+      rescue StandardError => e
+        # simplecov:disable defensive - catch-all for unexpected errors
         warn("ParsletGrammarFinder: Unexpected error: #{e.class}: #{e.message}")
-        if debug
-          warn("ParsletGrammarFinder: backtrace:\n  #{e.backtrace&.first(10)&.join("\n  ")}")
-        end
+        warn("ParsletGrammarFinder: backtrace:\n  #{e.backtrace&.first(10)&.join("\n  ")}") if debug
         @available = false
-        # :nocov:
+        # simplecov:enable
       end
 
       @available
@@ -151,16 +147,15 @@ module TreeHaver
     # @raise [NotAvailable] if grammar not available and raise_on_missing is true
     def register!(raise_on_missing: false)
       unless available?
-        if raise_on_missing
-          raise NotAvailable, not_found_message
-        end
+        raise NotAvailable, not_found_message if raise_on_missing
+
         return false
       end
 
       TreeHaver.register_language(
         @language_name,
         grammar_class: @grammar_class,
-        gem_name: @gem_name,
+        gem_name: @gem_name
       )
       true
     end
@@ -175,7 +170,7 @@ module TreeHaver
         grammar_const: @grammar_const,
         require_path: @require_path,
         available: available?,
-        grammar_class: @grammar_class&.name,
+        grammar_class: @grammar_class&.name
       }
     end
 
@@ -195,7 +190,7 @@ module TreeHaver
     # @return [Object] the constant
     # @raise [NameError] if constant not found
     def resolve_constant(const_path)
-      const_path.split("::").reduce(Object) do |mod, const_name|
+      const_path.split('::').reduce(Object) do |mod, const_name|
         mod.const_get(const_name)
       end
     end
@@ -208,9 +203,7 @@ module TreeHaver
       return false unless klass.respond_to?(:new)
 
       # Check if it's a Parslet::Parser subclass
-      if defined?(::Parslet::Parser)
-        return true if klass < ::Parslet::Parser
-      end
+      return true if defined?(::Parslet::Parser) && (klass < ::Parslet::Parser)
 
       # Fallback: check if it can create an instance that responds to parse
       begin