tree_haver 5.0.5 → 7.1.0

data/lib/tree_haver/backends/java.rb

@@ -70,12 +70,12 @@ module TreeHaver
     # @see https://central.sonatype.com/artifact/io.github.tree-sitter/jtreesitter Maven Central
     module Java
       # The Java package for java-tree-sitter
-      JAVA_PACKAGE = "io.github.treesitter.jtreesitter"
+      JAVA_PACKAGE = 'io.github.treesitter.jtreesitter'
 
       @load_attempted = false
       @loaded = false
-      @java_classes = {} # rubocop:disable ThreadSafety/MutableClassInstanceVariable
-      @runtime_lookup = nil  # Cached SymbolLookup for libtree-sitter.so
+      @java_classes = {}
+      @runtime_lookup = nil # Cached SymbolLookup for libtree-sitter.so
 
       module_function
 
@@ -104,16 +104,17 @@ module TreeHaver
       #   ENV["TREE_SITTER_JAVA_JARS_DIR"] = "/path/to/java-tree-sitter/jars"
       #   TreeHaver::Backends::Java.add_jars_from_env!
       def add_jars_from_env!
-        # :nocov:
+        # simplecov:disable
         # This method requires JRuby and cannot be tested on MRI/CRuby.
         # JRuby-specific CI jobs would test this code.
-        require "java"
+        require 'java'
 
         # Add JARs to classpath
-        dir = ENV["TREE_SITTER_JAVA_JARS_DIR"]
+        dir = ENV['TREE_SITTER_JAVA_JARS_DIR']
         if dir && Dir.exist?(dir)
-          Dir[File.join(dir, "**", "*.jar")].each do |jar|
+          Dir[File.join(dir, '**', '*.jar')].each do |jar|
             next if $CLASSPATH.include?(jar)
+
             $CLASSPATH << jar
           end
         end
@@ -121,7 +122,7 @@ module TreeHaver
         # Configure native library path for libtree-sitter
         # java-tree-sitter uses JNI and needs to find the native library
         configure_native_library_path!
-        # :nocov:
+        # simplecov:enable
       rescue LoadError
         # ignore; not JRuby or Java bridge not available
       end
@@ -131,23 +132,23 @@ module TreeHaver
       # @return [void]
       # @api private
       def configure_native_library_path!
-        # :nocov:
+        # simplecov:disable
         # This method requires JRuby and cannot be tested on MRI/CRuby.
-        lib_path = ENV["TREE_SITTER_RUNTIME_LIB"]
+        lib_path = ENV['TREE_SITTER_RUNTIME_LIB']
         return unless lib_path && File.exist?(lib_path)
 
         lib_dir = File.dirname(lib_path)
-        current_path = java.lang.System.getProperty("java.library.path") || ""
+        current_path = java.lang.System.getProperty('java.library.path') || ''
 
         unless current_path.include?(lib_dir)
           new_path = current_path.empty? ? lib_dir : "#{lib_dir}:#{current_path}"
-          java.lang.System.setProperty("java.library.path", new_path)
+          java.lang.System.setProperty('java.library.path', new_path)
 
           # Also set jna.library.path in case it uses JNA
-          java.lang.System.setProperty("jna.library.path", new_path)
+          java.lang.System.setProperty('jna.library.path', new_path)
         end
-        # :nocov:
-      rescue => _error
+        # simplecov:enable
+      rescue StandardError => _e
         # Ignore errors setting library path
       end
 
@@ -165,9 +166,10 @@ module TreeHaver
       #   end
       class << self
         def available?
-          return @loaded if @load_attempted # rubocop:disable ThreadSafety/ClassInstanceVariable
-          @load_attempted = true # rubocop:disable ThreadSafety/ClassInstanceVariable
-          @loaded = check_availability # rubocop:disable ThreadSafety/ClassInstanceVariable
+          return @loaded if @load_attempted
+
+          @load_attempted = true
+          @loaded = check_availability
         end
 
         # Reset the load state (primarily for testing)
@@ -175,21 +177,21 @@ module TreeHaver
         # @return [void]
         # @api private
         def reset!
-          @load_attempted = false # rubocop:disable ThreadSafety/ClassInstanceVariable
-          @loaded = false # rubocop:disable ThreadSafety/ClassInstanceVariable
-          @load_error = nil # rubocop:disable ThreadSafety/ClassInstanceVariable
-          @loader = nil # rubocop:disable ThreadSafety/ClassInstanceVariable
-          @java_classes = {} # rubocop:disable ThreadSafety/ClassInstanceVariable
+          @load_attempted = false
+          @loaded = false
+          @load_error = nil
+          @loader = nil
+          @java_classes = {}
         end
 
         private
 
         def check_availability
           # 1. Check Ruby engine
-          return false unless RUBY_ENGINE == "jruby"
+          return false unless RUBY_ENGINE == 'jruby'
 
           # 2. Check for required JARs via environment variable
-          jars_dir = ENV["TREE_SITTER_JAVA_JARS_DIR"]
+          jars_dir = ENV['TREE_SITTER_JAVA_JARS_DIR']
           return false unless jars_dir && Dir.exist?(jars_dir)
 
           # 3. Check if we can load the classes
@@ -222,19 +224,21 @@ module TreeHaver
       # @return [Hash{Symbol => Object}] capability map
       # @example
       #   TreeHaver::Backends::Java.capabilities
-      #   # => { backend: :java, parse: true, query: true, bytes_field: true, incremental: true }
+      #   # => { backend: :java, parse: true, query: true, bytes_field: true, incremental: true, comment_support: :nodes_only }
       def capabilities
-        # :nocov:
+        # simplecov:disable
         # This method returns meaningful data only on JRuby when java-tree-sitter is available.
         return {} unless available?
+
         {
           backend: :java,
           parse: true,
           query: true, # java-tree-sitter supports the Query API
           bytes_field: true,
           incremental: true, # java-tree-sitter supports Parser.parse(Tree, String)
+          comment_support: :nodes_only
         }
-        # :nocov:
+        # simplecov:enable
       end
 
       # Java backend language wrapper (raw backend language)
@@ -250,7 +254,7 @@ module TreeHaver
       # @see TreeHaver::Language The factory module users should interact with
       # @see https://tree-sitter.github.io/java-tree-sitter/io/github/treesitter/jtreesitter/Language.html
       #
-      # :nocov:
+      # simplecov:disable
       # All Java backend implementation classes require JRuby and cannot be tested on MRI/CRuby.
       # JRuby-specific CI jobs would test this code.
       class Language
@@ -290,10 +294,10 @@ module TreeHaver
           return unless other.backend == @backend
 
           # Compare by path first, then symbol
-          cmp = (@path || "") <=> (other.path || "")
+          cmp = (@path || '') <=> (other.path || '')
           return cmp if cmp.nonzero?
 
-          (@symbol || "") <=> (other.symbol || "")
+          (@symbol || '') <=> (other.symbol || '')
         end
 
         # Hash value for this language (for use in Sets/Hashes)
@@ -303,7 +307,7 @@ module TreeHaver
         end
 
         # Alias eql? to ==
-        alias_method :eql?, :==
+        alias eql? ==
 
         # Load a language from a shared library
         #
@@ -334,7 +338,7 @@ module TreeHaver
         #   )
         class << self
           def from_library(path, symbol: nil, name: nil)
-            raise TreeHaver::NotAvailable, "Java backend not available" unless Java.available?
+            raise TreeHaver::NotAvailable, 'Java backend not available' unless Java.available?
 
             # Use shared utility for consistent symbol derivation across backends
             # If symbol not provided, derive from name or path
@@ -351,7 +355,7 @@ module TreeHaver
               # We cache this lookup at the module level
               unless Java.runtime_lookup
                 # Use libraryLookup(String, Arena) to search LD_LIBRARY_PATH
-                Java.runtime_lookup = symbol_lookup_class.libraryLookup("libtree-sitter.so", arena)
+                Java.runtime_lookup = symbol_lookup_class.libraryLookup('libtree-sitter.so', arena)
               end
 
               # Now load the grammar library
@@ -378,30 +382,30 @@ module TreeHaver
               error_msg = "Failed to load language '#{sym}' from #{path}: #{e.message}"
               if root_cause.is_a?(::Java::JavaLang::UnsatisfiedLinkError)
                 unresolved = root_cause.message.to_s
-                if unresolved.include?("ts_language_version")
+                if unresolved.include?('ts_language_version')
                   # This specific symbol was renamed in tree-sitter 0.24
                   error_msg += "\n\nVersion mismatch detected: The grammar was built against " \
-                    "tree-sitter < 0.24 (uses ts_language_version), but your runtime library " \
+                    'tree-sitter < 0.24 (uses ts_language_version), but your runtime library ' \
                     "is tree-sitter >= 0.24 (uses ts_language_abi_version).\n\n" \
                     "Solutions:\n" \
                     "1. Rebuild the grammar against your version of tree-sitter\n" \
                     "2. Install a matching version of tree-sitter (< 0.24)\n" \
-                    "3. Find a pre-built grammar compatible with tree-sitter 0.24+"
-                elsif unresolved.include?("ts_language") || unresolved.include?("ts_parser")
+                    '3. Find a pre-built grammar compatible with tree-sitter 0.24+'
+                elsif unresolved.include?('ts_language') || unresolved.include?('ts_parser')
                   error_msg += "\n\nThe grammar library has unresolved tree-sitter symbols. " \
-                    "Ensure libtree-sitter.so is in LD_LIBRARY_PATH and version-compatible " \
-                    "with the grammar."
+                    'Ensure libtree-sitter.so is in LD_LIBRARY_PATH and version-compatible ' \
+                    'with the grammar.'
                 end
               end
               raise TreeHaver::NotAvailable, error_msg
             rescue ::Java::JavaLang::UnsatisfiedLinkError => e
               raise TreeHaver::NotAvailable,
-                "Native library error loading #{path}: #{e.message}. " \
-                  "Ensure the library is in LD_LIBRARY_PATH."
+                    "Native library error loading #{path}: #{e.message}. " \
+                      'Ensure the library is in LD_LIBRARY_PATH.'
             rescue ::Java::JavaLang::IllegalArgumentException => e
               raise TreeHaver::NotAvailable,
-                "Could not find library '#{path}': #{e.message}. " \
-                  "Ensure it's in LD_LIBRARY_PATH or provide an absolute path."
+                    "Could not find library '#{path}': #{e.message}. " \
+                      "Ensure it's in LD_LIBRARY_PATH or provide an absolute path."
             end
           end
 
@@ -420,14 +424,14 @@ module TreeHaver
           #   # tree-sitter-toml-0.23.2.jar from Maven Central
           #   lang = TreeHaver::Backends::Java::Language.load_by_name("toml")
           def load_by_name(name)
-            raise TreeHaver::NotAvailable, "Java backend not available" unless Java.available?
+            raise TreeHaver::NotAvailable, 'Java backend not available' unless Java.available?
 
             # Try to find the grammar library in standard locations
             # Look for library names like "tree-sitter-toml" or "libtree-sitter-toml"
             lib_names = [
               "tree-sitter-#{name}",
               "libtree-sitter-#{name}",
-              "tree_sitter_#{name}",
+              "tree_sitter_#{name}"
             ]
 
             begin
@@ -436,7 +440,7 @@ module TreeHaver
 
               # Ensure runtime lookup is available
               unless Java.runtime_lookup
-                Java.runtime_lookup = symbol_lookup_class.libraryLookup("libtree-sitter.so", arena)
+                Java.runtime_lookup = symbol_lookup_class.libraryLookup('libtree-sitter.so', arena)
               end
 
               # Try each library name
@@ -451,9 +455,9 @@ module TreeHaver
 
               unless grammar_lookup
                 raise TreeHaver::NotAvailable,
-                  "Failed to load language '#{name}': Library not found. " \
-                    "Ensure the grammar library (e.g., libtree-sitter-#{name}.so) " \
-                    "is in LD_LIBRARY_PATH."
+                      "Failed to load language '#{name}': Library not found. " \
+                        "Ensure the grammar library (e.g., libtree-sitter-#{name}.so) " \
+                        'is in LD_LIBRARY_PATH.'
               end
 
               combined_lookup = grammar_lookup.or(Java.runtime_lookup)
@@ -462,15 +466,15 @@ module TreeHaver
               new(java_lang, symbol: sym)
             rescue ::Java::JavaLang::RuntimeException => e
               raise TreeHaver::NotAvailable,
-                "Failed to load language '#{name}': #{e.message}. " \
-                  "Ensure the grammar library (e.g., libtree-sitter-#{name}.so) " \
-                  "is in LD_LIBRARY_PATH."
+                    "Failed to load language '#{name}': #{e.message}. " \
+                      "Ensure the grammar library (e.g., libtree-sitter-#{name}.so) " \
+                      'is in LD_LIBRARY_PATH.'
             end
           end
         end
 
         class << self
-          alias_method :from_path, :from_library
+          alias from_path from_library
         end
       end
 
@@ -493,7 +497,8 @@ module TreeHaver
         #
         # @raise [TreeHaver::NotAvailable] if Java backend is not available
         def initialize
-          raise TreeHaver::NotAvailable, "Java backend not available" unless Java.available?
+          raise TreeHaver::NotAvailable, 'Java backend not available' unless Java.available?
+
           @parser = Java.java_classes[:Parser].new
         end
 
@@ -517,7 +522,8 @@ module TreeHaver
           java_result = @parser.parse(source)
           # jtreesitter 0.26.0 returns Optional<Tree>
           java_tree = unwrap_optional(java_result)
-          raise TreeHaver::Error, "Parser returned no tree" unless java_tree
+          raise TreeHaver::Error, 'Parser returned no tree' unless java_tree
+
           Tree.new(java_tree)
         end
 
@@ -538,23 +544,24 @@ module TreeHaver
           if old_tree
             # Get the actual Java Tree object
             java_old_tree = if old_tree.is_a?(Tree)
-              old_tree.impl
-            else
-              unwrap_optional(old_tree)
-            end
+                              old_tree.impl
+                            else
+                              unwrap_optional(old_tree)
+                            end
 
             java_result = if java_old_tree
-              # jtreesitter 0.26.0 API: parse(String source, Tree oldTree)
-              @parser.parse(source, java_old_tree)
-            else
-              @parser.parse(source)
-            end
+                            # jtreesitter 0.26.0 API: parse(String source, Tree oldTree)
+                            @parser.parse(source, java_old_tree)
+                          else
+                            @parser.parse(source)
+                          end
           else
             java_result = @parser.parse(source)
           end
           # jtreesitter 0.26.0 returns Optional<Tree>
           java_tree = unwrap_optional(java_result)
-          raise TreeHaver::Error, "Parser returned no tree" unless java_tree
+          raise TreeHaver::Error, 'Parser returned no tree' unless java_tree
+
           Tree.new(java_tree)
         end
 
@@ -568,6 +575,7 @@ module TreeHaver
         # @return [Object, nil] unwrapped value or nil if empty
         def unwrap_optional(value)
           return value unless value.respond_to?(:isPresent)
+
           value.isPresent ? value.get : nil
         end
       end
@@ -618,12 +626,14 @@ module TreeHaver
           result = @impl.rootNode
           # jtreesitter 0.26.0: rootNode() may return Optional<Node> or Node directly
           java_node = if result.respond_to?(:isPresent)
-            raise TreeHaver::Error, "Tree has no root node" unless result.isPresent
-            result.get
-          else
-            result
-          end
-          raise TreeHaver::Error, "Tree has no root node" unless java_node
+                        raise TreeHaver::Error, 'Tree has no root node' unless result.isPresent
+
+                        result.get
+                      else
+                        result
+                      end
+          raise TreeHaver::Error, 'Tree has no root node' unless java_node
+
           Node.new(java_node)
         end
 
@@ -650,7 +660,7 @@ module TreeHaver
             new_end_byte,
             start_pt,
             old_end_pt,
-            new_end_pt,
+            new_end_pt
           )
 
           @impl.edit(input_edit)
@@ -723,6 +733,7 @@ module TreeHaver
           # Handle Java Optional
           if result.respond_to?(:isPresent)
             return unless result.isPresent
+
             java_node = result.get
           else
             # Direct Node return (some jtreesitter versions)
@@ -747,6 +758,7 @@ module TreeHaver
           # Handle Java Optional
           if result.respond_to?(:isPresent)
             return unless result.isPresent
+
             java_node = result.get
           else
             # Direct Node return (some jtreesitter versions)
@@ -762,6 +774,7 @@ module TreeHaver
         # @return [void]
         def each
           return enum_for(:each) unless block_given?
+
           child_count.times do |i|
             yield child(i)
           end
@@ -786,7 +799,7 @@ module TreeHaver
         # @return [Hash] with :row and :column keys
         def start_point
           pt = @impl.startPoint
-          {row: pt.row, column: pt.column}
+          { row: pt.row, column: pt.column }
         end
 
         # Get the end point (row, column)
@@ -794,7 +807,7 @@ module TreeHaver
         # @return [Hash] with :row and :column keys
         def end_point
           pt = @impl.endPoint
-          {row: pt.row, column: pt.column}
+          { row: pt.row, column: pt.column }
         end
 
         # Check if this node has an error
@@ -829,6 +842,7 @@ module TreeHaver
           # Handle Java Optional
           if result.respond_to?(:isPresent)
             return unless result.isPresent
+
             java_node = result.get
           else
             java_node = result
@@ -848,6 +862,7 @@ module TreeHaver
           # Handle Java Optional
           if result.respond_to?(:isPresent)
             return unless result.isPresent
+
             java_node = result.get
           else
             java_node = result
@@ -867,6 +882,7 @@ module TreeHaver
           # Handle Java Optional
           if result.respond_to?(:isPresent)
             return unless result.isPresent
+
             java_node = result.get
           else
             java_node = result
@@ -882,7 +898,7 @@ module TreeHaver
           @impl.text.to_s
         end
       end
-      # :nocov:
+      # simplecov:enable
 
       # Register the availability checker for RSpec dependency tags
       TreeHaver::BackendRegistry.register_availability_checker(:java) do

data/lib/tree_haver/backends/mri.rb

@@ -57,29 +57,30 @@ module TreeHaver
       #   end
       class << self
         def available?
-          return @loaded if @load_attempted # rubocop:disable ThreadSafety/ClassInstanceVariable
-          @load_attempted = true # rubocop:disable ThreadSafety/ClassInstanceVariable
+          return @loaded if @load_attempted
+
+          @load_attempted = true
           begin
             # ruby_tree_sitter is a C extension that only works on MRI
             # It doesn't work on JRuby or TruffleRuby
-            if RUBY_ENGINE == "ruby"
-              require "tree_sitter"
-              @loaded = true # rubocop:disable ThreadSafety/ClassInstanceVariable
+            if RUBY_ENGINE == 'ruby'
+              require 'tree_sitter'
+              @loaded = true
             else
-              # :nocov: only runs on non-MRI engines (JRuby, TruffleRuby)
-              @loaded = false # rubocop:disable ThreadSafety/ClassInstanceVariable
-              # :nocov:
+              # simplecov:disable only runs on non-MRI engines (JRuby, TruffleRuby)
+              @loaded = false
+              # simplecov:enable
             end
           rescue LoadError
-            # :nocov: only runs when ruby_tree_sitter gem is not installed
-            @loaded = false # rubocop:disable ThreadSafety/ClassInstanceVariable
-            # :nocov:
+            # simplecov:disable only runs when ruby_tree_sitter gem is not installed
+            @loaded = false
+            # simplecov:enable
           rescue StandardError
-            # :nocov: defensive code - StandardError during require is extremely rare
-            @loaded = false # rubocop:disable ThreadSafety/ClassInstanceVariable
-            # :nocov:
+            # simplecov:disable defensive code - StandardError during require is extremely rare
+            @loaded = false
+            # simplecov:enable
           end
-          @loaded # rubocop:disable ThreadSafety/ClassInstanceVariable
+          @loaded
         end
 
         # Reset the load state (primarily for testing)
@@ -87,8 +88,8 @@ module TreeHaver
         # @return [void]
         # @api private
         def reset!
-          @load_attempted = false # rubocop:disable ThreadSafety/ClassInstanceVariable
-          @loaded = false # rubocop:disable ThreadSafety/ClassInstanceVariable
+          @load_attempted = false
+          @loaded = false
         end
 
         # Get capabilities supported by this backend
@@ -96,14 +97,16 @@ module TreeHaver
         # @return [Hash{Symbol => Object}] capability map
         # @example
         #   TreeHaver::Backends::MRI.capabilities
-        #   # => { backend: :mri, query: true, bytes_field: true, incremental: true }
+        #   # => { backend: :mri, query: true, bytes_field: true, incremental: true, comment_support: :nodes_only }
         def capabilities
           return {} unless available?
+
           {
             backend: :mri,
             query: true,
             bytes_field: true,
             incremental: true,
+            comment_support: :nodes_only
           }
         end
       end
@@ -150,7 +153,7 @@ module TreeHaver
         def language_name
           # Try to derive from symbol (e.g., "tree_sitter_toml" -> :toml)
           if @symbol
-            name = @symbol.to_s.sub(/^tree_sitter_/, "")
+            name = @symbol.to_s.sub(/^tree_sitter_/, '')
             return name.to_sym
           end
 
@@ -164,7 +167,7 @@ module TreeHaver
         end
 
         # Alias for language_name (API compatibility)
-        alias_method :name, :language_name
+        alias name language_name
 
         # Compare languages for equality
         #
@@ -178,10 +181,10 @@ module TreeHaver
           return unless other.backend == @backend
 
           # Compare by path first, then symbol
-          cmp = (@path || "") <=> (other.path || "")
+          cmp = (@path || '') <=> (other.path || '')
           return cmp if cmp.nonzero?
 
-          (@symbol || "") <=> (other.symbol || "")
+          (@symbol || '') <=> (other.symbol || '')
         end
 
         # Hash value for this language (for use in Sets/Hashes)
@@ -191,7 +194,7 @@ module TreeHaver
         end
 
         # Alias eql? to ==
-        alias_method :eql?, :==
+        alias eql? ==
 
         # Convert to the underlying TreeSitter::Language for passing to parser
         #
@@ -199,7 +202,7 @@ module TreeHaver
         def to_language
           @inner_language
         end
-        alias_method :to_ts_language, :to_language
+        alias to_ts_language to_language
 
         # Load a language from a shared library (preferred method)
         #
@@ -227,7 +230,7 @@ module TreeHaver
           # @return [Language] wrapped language handle
           # @api private
           def from_path(path, symbol: nil, name: nil)
-            raise TreeHaver::NotAvailable, "ruby_tree_sitter not available" unless MRI.available?
+            raise TreeHaver::NotAvailable, 'ruby_tree_sitter not available' unless MRI.available?
 
             # ruby_tree_sitter's TreeSitter::Language.load takes (language_name, path_to_so)
             # where language_name is the language identifier (e.g., "toml", "json")
@@ -235,7 +238,7 @@ module TreeHaver
             # and path_to_so is the full path to the .so file
             #
             # If name is not provided, derive it from symbol using shared utility
-            language_name = name || LibraryPathUtils.derive_language_name_from_symbol(symbol)
+            language_name = (name || LibraryPathUtils.derive_language_name_from_symbol(symbol)).to_s
             ts_lang = ::TreeSitter::Language.load(language_name, path)
             new(ts_lang, path: path, symbol: symbol)
           rescue NameError => e
@@ -247,9 +250,9 @@ module TreeHaver
             # at parse time when TreeSitter constant isn't loaded yet
             if defined?(TreeSitter::TreeSitterError) && e.is_a?(TreeSitter::TreeSitterError)
               raise TreeHaver::NotAvailable, "Could not load language: #{e.message}"
-            else
-              raise # Re-raise if it's not a TreeSitter error
             end
+
+            raise # Re-raise if it's not a TreeSitter error
           end
         end
       end
@@ -262,7 +265,8 @@ module TreeHaver
         #
         # @raise [TreeHaver::NotAvailable] if ruby_tree_sitter is not available
         def initialize
-          raise TreeHaver::NotAvailable, "ruby_tree_sitter not available" unless MRI.available?
+          raise TreeHaver::NotAvailable, 'ruby_tree_sitter not available' unless MRI.available?
+
           @parser = ::TreeSitter::Parser.new
         rescue NameError => e
           # TreeSitter constant doesn't exist - backend not loaded
@@ -273,9 +277,9 @@ module TreeHaver
           # at parse time when TreeSitter constant isn't loaded yet
           if defined?(TreeSitter::TreeSitterError) && e.is_a?(TreeSitter::TreeSitterError)
             raise TreeHaver::NotAvailable, "Could not create parser: #{e.message}"
-          else
-            raise # Re-raise if it's not a TreeSitter error
           end
+
+          raise # Re-raise if it's not a TreeSitter error
         end
 
         # Set the language for this parser
@@ -288,7 +292,7 @@ module TreeHaver
           inner_lang = lang.respond_to?(:inner_language) ? lang.inner_language : lang
           @parser.language = inner_lang
           # Verify it was set
-          raise TreeHaver::NotAvailable, "Language not set correctly" if @parser.language.nil?
+          raise TreeHaver::NotAvailable, 'Language not set correctly' if @parser.language.nil?
 
           # Return the original language object (wrapped or unwrapped)
           lang
@@ -298,9 +302,9 @@ module TreeHaver
           # at parse time when TreeSitter constant isn't loaded yet
           if defined?(TreeSitter::TreeSitterError) && e.is_a?(TreeSitter::TreeSitterError)
             raise TreeHaver::NotAvailable, "Could not set language: #{e.message}"
-          else
-            raise # Re-raise if it's not a TreeSitter error
           end
+
+          raise # Re-raise if it's not a TreeSitter error
         end
 
         # Parse source code
@@ -315,7 +319,8 @@ module TreeHaver
           # Pass nil for old_tree (initial parse)
           # Return raw tree - TreeHaver::Parser will wrap it
           tree = @parser.parse_string(nil, source)
-          raise TreeHaver::NotAvailable, "Parse returned nil - is language set?" if tree.nil?
+          raise TreeHaver::NotAvailable, 'Parse returned nil - is language set?' if tree.nil?
+
           tree
         rescue Exception => e # rubocop:disable Lint/RescueException
           # TreeSitter errors inherit from Exception (not StandardError) in ruby_tree_sitter v2+
@@ -323,9 +328,9 @@ module TreeHaver
           # at parse time when TreeSitter constant isn't loaded yet
           if defined?(TreeSitter::TreeSitterError) && e.is_a?(TreeSitter::TreeSitterError)
             raise TreeHaver::NotAvailable, "Could not parse source: #{e.message}"
-          else
-            raise # Re-raise if it's not a TreeSitter error
           end
+
+          raise # Re-raise if it's not a TreeSitter error
         end
 
         # Parse source code with optional incremental parsing
@@ -347,9 +352,9 @@ module TreeHaver
           # at parse time when TreeSitter constant isn't loaded yet
           if defined?(TreeSitter::TreeSitterError) && e.is_a?(TreeSitter::TreeSitterError)
             raise TreeHaver::NotAvailable, "Could not parse source: #{e.message}"
-          else
-            raise # Re-raise if it's not a TreeSitter error
           end
+
+          raise # Re-raise if it's not a TreeSitter error
         end
       end