solargraph-rspec 0.5.4 → 0.6.0

data/gemfiles/default.gemfile.lock

@@ -1,54 +1,51 @@
 PATH
   remote: ..
   specs:
-    solargraph-rspec (0.4.1)
-      solargraph (~> 0.52, >= 0.52.0)
+    solargraph-rspec (0.5.5)
+      solargraph (>= 0.52.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      actionview (= 7.1.5.1)
-      activejob (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailer (8.0.2.1)
+      actionpack (= 8.0.2.1)
+      actionview (= 8.0.2.1)
+      activejob (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.5.1)
-      actionview (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actionpack (8.0.2.1)
+      actionview (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
       nokogiri (>= 1.8.5)
-      racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actionview (7.1.5.1)
-      activesupport (= 7.1.5.1)
+      useragent (~> 0.16)
+    actionview (8.0.2.1)
+      activesupport (= 8.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.5.1)
-      activesupport (= 7.1.5.1)
+    activejob (8.0.2.1)
+      activesupport (= 8.0.2.1)
       globalid (>= 0.3.6)
-    activesupport (7.1.5.1)
+    activesupport (8.0.2.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
       securerandom (>= 0.3)
-      tzinfo (~> 2.0)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     airborne (0.3.7)
@@ -63,50 +60,54 @@ GEM
       thor (>= 0.14.0)
     ast (2.4.3)
     backport (1.2.0)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (3.2.3)
     builder (3.3.0)
-    byebug (11.1.3)
+    byebug (12.0.0)
     coderay (1.1.3)
+    commander (5.0.0)
+      highline (~> 3.0.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
+    connection_pool (2.5.4)
     crack (1.0.0)
       bigdecimal
       rexml
     crass (1.0.6)
     date (3.4.1)
-    debug (1.10.0)
+    debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    diff-lcs (1.6.0)
+    diff-lcs (1.6.2)
     docile (1.4.1)
     domain_name (0.6.20240107)
-    drb (2.2.1)
+    drb (2.2.3)
+    erb (5.0.2)
     erubi (1.13.1)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    hashdiff (1.1.2)
+    hashdiff (1.2.1)
+    highline (3.0.1)
     http-accept (1.7.0)
     http-cookie (1.0.8)
       domain_name (~> 0.5)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    io-console (0.8.0)
-    irb (1.15.1)
+    io-console (0.8.1)
+    irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    jaro_winkler (1.6.0)
-    json (2.10.2)
-    kramdown (2.5.1)
-      rexml (>= 3.3.9)
+    jaro_winkler (1.7.0)
+    json (2.21.2)
+    kramdown (2.5.2)
+      rexml (>= 3.4.4)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    language_server-protocol (3.17.0.4)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
-    logger (1.6.6)
-    loofah (2.24.0)
+    logger (1.7.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -115,14 +116,13 @@ GEM
       net-pop
       net-smtp
     method_source (1.1.0)
-    mime-types (3.6.1)
+    mime-types (3.7.0)
       logger
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2025.0318)
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0916)
     mini_mime (1.1.5)
     minitest (5.25.5)
-    mutex_m (0.3.0)
-    net-imap (0.4.19)
+    net-imap (0.4.22)
       date
       net-protocol
     net-pop (0.1.2)
@@ -132,33 +132,40 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     netrc (0.11.0)
-    nokogiri (1.17.2-arm64-darwin)
+    nokogiri (1.19.4-arm64-darwin)
       racc (~> 1.4)
     observer (0.1.2)
+    open3 (0.2.1)
     optparse (0.6.0)
-    ostruct (0.6.1)
-    parallel (1.26.3)
-    parser (3.3.7.2)
+    ostruct (0.6.3)
+    parallel (2.1.0)
+    parlour (9.1.2)
+      commander (~> 5.0)
+      parser
+      rainbow (~> 3.0)
+      sorbet-runtime (>= 0.5)
+    parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
-    profile-viewer (0.0.4)
+    prism (1.9.0)
+    profile-viewer (0.0.5)
       optparse
       webrick
-    pry (0.14.2)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.10.1)
-      byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
-    psych (5.2.3)
+    pry-byebug (3.11.0)
+      byebug (~> 12.0)
+      pry (>= 0.13, < 0.16)
+    psych (5.2.6)
       date
       stringio
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     racc (1.8.1)
-    rack (2.2.13)
+    rack (2.2.17)
     rack-session (1.0.2)
       rack (< 3)
     rack-test (1.1.0)
@@ -166,82 +173,91 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      irb
+    railties (8.0.2.1)
+      actionpack (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.2.1)
-    rbs (3.6.1)
+    rake (13.3.0)
+    rbs (4.1.3)
       logger
-    rdoc (6.12.0)
+      prism (>= 1.6.0)
+      tsort
+    rdoc (7.2.0)
+      erb
       psych (>= 4.0.0)
-    redis-client (0.24.0)
+      tsort
+    redis-client (0.25.3)
       connection_pool
-    regexp_parser (2.10.0)
-    reline (0.6.0)
+    regexp_parser (2.12.0)
+    reline (0.6.2)
       io-console (~> 0.5)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    reverse_markdown (3.0.0)
+    reverse_markdown (3.0.2)
       nokogiri
-    rexml (3.4.1)
-    rspec (3.13.0)
+    rexml (3.4.4)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.3)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (7.1.1)
-      actionpack (>= 7.0)
-      activesupport (>= 7.0)
-      railties (>= 7.0)
+    rspec-rails (8.0.2)
+      actionpack (>= 7.2)
+      activesupport (>= 7.2)
+      railties (>= 7.2)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-sidekiq (5.1.0)
+    rspec-sidekiq (5.2.0)
       rspec-core (~> 3.0)
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 9)
-    rspec-support (3.13.2)
-    rubocop (1.74.0)
+    rspec-support (3.13.6)
+    rubocop (1.89.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.41.0)
+    rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    rubocop-yard (1.0.0)
+      lint_roller
+      rubocop (~> 1.72)
+      yard
     ruby-progressbar (1.13.0)
-    securerandom (0.3.2)
-    shoulda-matchers (6.4.0)
+    securerandom (0.4.1)
+    shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
     sidekiq (7.3.9)
       base64
@@ -253,70 +269,99 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-cobertura (2.1.0)
+    simplecov-cobertura (3.1.0)
       rexml
       simplecov (~> 0.19)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    solargraph (0.52.0)
+    solargraph (0.60.3)
+      ast (~> 2.4.3)
       backport (~> 1.2)
-      benchmark
-      bundler (~> 2.0)
+      benchmark (~> 0.4)
+      bundler (>= 2.0)
       diff-lcs (~> 1.4)
-      jaro_winkler (~> 1.6)
+      jaro_winkler (~> 1.6, >= 1.6.1)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
       logger (~> 1.6)
       observer (~> 0.1)
+      open3 (~> 0.2.1)
       ostruct (~> 0.6)
       parser (~> 3.0)
-      rbs (~> 3.0)
-      reverse_markdown (>= 2.0, < 4)
-      rubocop (~> 1.38)
+      prism (~> 1.4)
+      rbs (>= 3.10.0)
+      rdoc (~> 7.0)
+      reverse_markdown (~> 3.0)
+      rubocop (~> 1.76)
+      sord (~> 7.0)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
+      yard-activesupport-concern (~> 0.0)
       yard-solargraph (~> 0.1)
-    stringio (3.1.5)
-    thor (1.3.2)
-    tilt (2.6.0)
+    sorbet-runtime (0.6.13425)
+    sord (7.1.0)
+      commander (~> 5.0)
+      parlour (~> 9.1)
+      parser
+      rbs (>= 3.0, < 5)
+      sorbet-runtime
+      yard
+    stringio (3.1.7)
+    thor (1.5.0)
+    tilt (2.8.0)
     timeout (0.4.3)
+    tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    unparser (0.8.0)
+      diff-lcs (~> 1.6)
+      parser (>= 3.3.0)
+      prism (>= 1.4)
+    uri (1.0.3)
+    useragent (0.16.11)
     webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.1)
-    yard (0.9.37)
+    yard (0.9.45)
+    yard-activesupport-concern (0.0.1)
+      yard (>= 0.8)
     yard-solargraph (0.1.0)
       yard (~> 0.9)
-    zeitwerk (2.6.18)
+    zeitwerk (2.7.3)
 
 PLATFORMS
+  arm64-darwin-22
+  arm64-darwin-23
   arm64-darwin-24
 
 DEPENDENCIES
-  actionmailer
+  actionmailer (>= 7)
   airborne
   appraisal
   bundler
   debug
+  net-imap (~> 0.4.0)
   profile-viewer
   pry-byebug
   rake
+  rbs
   rspec
-  rspec-rails
+  rspec-rails (>= 7)
   rspec-sidekiq
   rubocop
+  rubocop-yard
   shoulda-matchers
   simplecov
   simplecov-cobertura
   solargraph-rspec!
+  unparser
   webmock
 
 BUNDLED WITH
-   2.3.17
+   2.6.9

data/lib/solargraph/rspec/config.rb

@@ -6,6 +6,9 @@ module Solargraph
     #   rspec:
     #     let_methods:
     #       - let_it_be
+    #     config_helper_files:
+    #       - spec/spec_helper.rb
+    #       - spec/rails_helper.rb
     class Config
       def initialize(solargraph_config = Solargraph::Workspace::Config.new('./'))
         @solargraph_config = solargraph_config
@@ -25,8 +28,18 @@ module Solargraph
         (Rspec::EXAMPLE_METHODS + additional_example_methods).map(&:to_sym)
       end
 
+      # @return [Array<String>]
+      def config_helper_files
+        DEFAULT_CONFIG_HELPER_FILES + additional_config_helper_files
+      end
+
       private
 
+      DEFAULT_CONFIG_HELPER_FILES = [
+        'spec/spec_helper.rb',
+        'spec/rails_helper.rb'
+      ].freeze
+
       # @return [Hash]
       def rspec_raw_data
         @rspec_raw_data ||= raw_data['rspec'] || {}
@@ -34,12 +47,23 @@ module Solargraph
 
       # @return [Array<Symbol>]
       def additional_let_methods
-        (rspec_raw_data['let_methods'] || []).map(&:to_sym)
+        # @type [Array<String>, nil]
+        let_methods = rspec_raw_data['let_methods']
+        (let_methods || []).map(&:to_sym)
       end
 
       # @return [Array<Symbol>]
       def additional_example_methods
-        (rspec_raw_data['example_methods'] || []).map(&:to_sym)
+        # @type [Array<String>, nil]
+        example_methods = rspec_raw_data['example_methods']
+        (example_methods || []).map(&:to_sym)
+      end
+
+      # @return [Array<String>]
+      def additional_config_helper_files
+        # @type [Array<String>, nil]
+        config_files = rspec_raw_data['config_helper_files']
+        config_files || []
       end
 
       # @return [Hash]

data/lib/solargraph/rspec/convention.rb

@@ -9,8 +9,9 @@ require_relative 'correctors/described_class_corrector'
 require_relative 'correctors/let_methods_corrector'
 require_relative 'correctors/subject_method_corrector'
 require_relative 'correctors/dsl_methods_corrector'
-require_relative 'test_helpers'
+require_relative 'gems'
 require_relative 'pin_factory'
+require_relative 'rspec_configure'
 
 module Solargraph
   module Rspec
@@ -78,16 +79,24 @@ module Solargraph
         filename.include?('spec/')
       end
 
-      # @param yard_map [YardMap]
+      # @param _yard_map [YardMap]
       # @return [Environ]
       def global(_yard_map)
         pins = []
-        pins += Solargraph::Rspec::TestHelpers.include_helper_pins(
+        pins += Solargraph::Rspec::Gems.include_helper_pins(
           root_example_group_namespace_pin: root_example_group_namespace_pin
         )
         pins += annotation_pins
+
+        # Add pins from RSpec.configure blocks
+        rspec_configure = RSpecConfigure.new(
+          config: config,
+          root_namespace_pin: root_example_group_namespace_pin
+        )
+        pins += rspec_configure.pins
+
         # TODO: Include gem requires conditionally based on Gemfile definition
-        requires = Solargraph::Rspec::TestHelpers.gem_names
+        requires = Solargraph::Rspec::Gems.gem_names + rspec_configure.extra_requires
 
         if pins.any?
           Solargraph.logger.debug(

data/lib/solargraph/rspec/correctors/base.rb

@@ -12,7 +12,7 @@ module Solargraph
         # @return [Solargraph::Rspec::SpecWalker]
         attr_reader :rspec_walker
 
-        # @return [Array<Solargraph::Pin::Base]
+        # @return [Array<Solargraph::Pin::Base>]
         attr_reader :added_pins
 
         # @param namespace_pins [Array<Solargraph::Pin::Base>]
@@ -68,11 +68,61 @@ module Solargraph
         # @param pin [Solargraph::Pin::Base]
         # @param new_closure [Solargraph::Pin::Closure]
         def override_closure(pin, new_closure)
+          if pin.respond_to?(:closure=)
+            pin.closure = new_closure
+            return
+          end
+
+          # work around older version of Solargraph
           pin.instance_variable_set('@closure', new_closure)
           pin.reset_generated!
 
           pin.remove_instance_variable(:@path) if pin.instance_variables.include? :@path
         end
+
+        # Given the following code, Solargraph::Parser.node_range returns the following range for block ast:
+        #
+        # ```ruby
+        #   some_method_with_block do
+        #   ^ - block start
+        #   end
+        #   ^ - block end
+        # ```
+        #
+        # Instead we want the range to be:
+        #
+        # ```ruby
+        #   some_method_with_block do
+        #                          ^ - block start
+        #   end
+        #   ^ - block end
+        # ```
+        #
+        # @param closure [Solargraph::Pin::Closure]
+        # @param source_map [Solargraph::SourceMap]
+        # @return [void]
+        def override_block_location(closure, source_map)
+          range = closure.location.range
+          block_ast = source_map.source.node_at(range.ending.line, range.ending.column)
+          new_location = PinFactory.build_location(
+            PinFactory.build_location_range(block_ast),
+            closure.location.filename
+          )
+
+          if closure.respond_to?(:location=)
+            closure.location = new_location
+          else
+            # work around older version of Solargraph
+            closure.instance_variable_set('@location', new_location)
+            closure.reset_generated!
+          end
+
+          # find children of this pin and reset them, as they may have
+          # cached their binder or context based on the old closure
+          source_map.pins.select { |child_pin| child_pin.closure == closure }.each do |child_pin|
+            child_pin.reset_generated!
+          end
+        end
       end
     end
   end

data/lib/solargraph/rspec/correctors/context_block_namespace_corrector.rb

@@ -26,6 +26,7 @@ module Solargraph
             )
 
             override_closure(original_block_pin, namespace_pin)
+            override_block_location(original_block_pin, source_map)
 
             # Include DSL methods in the example group block
             # TODO: This does not work on solagraph! Class methods are not included from parent class.

data/lib/solargraph/rspec/correctors/described_class_corrector.rb

@@ -7,7 +7,7 @@ module Solargraph
     module Correctors
       # Defines `described_class` method in the example group block
       class DescribedClassCorrector < Base
-        # @param source_map [Solargraph::SourceMap]
+        # @param _source_map [Solargraph::SourceMap]
         # @return [void]
         def correct(_source_map)
           rspec_walker.on_described_class do |described_class_name, location_range|

data/lib/solargraph/rspec/correctors/example_and_hook_blocks_binding_corrector.rb

@@ -45,6 +45,7 @@ module Solargraph
                                                            location_range.start.column)
 
           override_closure(original_block_pin, example_run_method(namespace_pin))
+          override_block_location(original_block_pin, source_map)
         end
 
         # @param namespace_pin [Solargraph::Pin::Namespace]

data/lib/solargraph/rspec/correctors/let_methods_corrector.rb

@@ -7,7 +7,7 @@ module Solargraph
     module Correctors
       # Defines let-like methods in the example group block
       class LetMethodsCorrector < Base
-        # @param source_map [Solargraph::SourceMap]
+        # @param _source_map [Solargraph::SourceMap]
         # @return [void]
         def correct(_source_map)
           rspec_walker.on_let_method do |let_name, location_range, fake_method_ast|
@@ -23,6 +23,7 @@ module Solargraph
 
         # @param namespace [Pin::Namespace]
         # @param method_name [String]
+        # @param location_range [Range]
         # @param node [::Parser::AST::Node, nil]
         # @param types [Array<String>, nil]
         # @return [Pin::Method, nil]

data/lib/solargraph/rspec/correctors/subject_method_corrector.rb

@@ -7,7 +7,7 @@ module Solargraph
     module Correctors
       # Defines let-like methods in the example group block
       class SubjectMethodCorrector < LetMethodsCorrector
-        # @param source_map [Solargraph::SourceMap]
+        # @param _source_map [Solargraph::SourceMap]
         # @return [void]
         def correct(_source_map)
           rspec_walker.on_subject do |subject_name, location_range, fake_method_ast|
@@ -75,7 +75,7 @@ module Solargraph
         end
 
         # @param namespace_pin [Pin::Namespace]
-        # @param method_name [:is_expected, :should, :should_not]
+        # @param method_name [:is_expected, :should, :should_not] # rubocop:disable YARD/TagTypeSyntax
         # @param location [Solargraph::Location]
         # @return [Pin::Method]
         def one_liner_expectation_pin(namespace_pin, method_name, location)