solargraph-rspec 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be3e0236b9ee7ad2bc78abe9764001fc4ec2432a381571e23dddc27923caacb
-  data.tar.gz: 217d891f9561406a322f037948f13a3197f39d980f8394e36fc86304b8bccde9
+  metadata.gz: e419b2a50e53e4fab9030c7efc9821aef1c245987b50c87e0222e7889a024065
+  data.tar.gz: 0eb5170d658591b473c7c9df2613d017889bcf0c4e9488579ae07b6fa40c1e2c
 SHA512:
-  metadata.gz: 1c91744f1a8a2bb3a021f6cf008d627a292bf112c15b8215d7c9217d7bddf812b1f73b92a8d434d54755b10dd77b1f6b571c0b77ada0087b28e01e9f311e9c58
-  data.tar.gz: 3d9a7e4405f2ce232d31e7310a2af32c1f0e1d86cc8b48b461c899310b6bf9a8c9f43a1a0c661074fd670d1433827472161618a3ddb0cbfda551b8ab06953bac
+  metadata.gz: 4fd09eda66acdf1c5688152d5b5fae30afc7c97461eefd13bbf2c5e9be8fae53a05c822e7d3cb2a03d46d7823016c6119d0887fb0d6f1ee165010f824450617b
+  data.tar.gz: 54d762f7d838d9671ef57a3e9963fdba3ec850ce51ae8d69b9d05fb27dc569370feda39c7d09f1056dce6f6a384d097d30aa361de4adf5ed5b2d480d591b3867

data/.rspec

@@ -1,3 +1,4 @@
 --format documentation
 --color
 --require spec_helper
+--profile

data/.rubocop.yml

@@ -1,17 +1,19 @@
+plugins:
+  - rubocop-yard
+
 AllCops:
   TargetRubyVersion: 3.0
   NewCops: enable
+  Exclude:
+    - 'gemfiles/**/*' # these are autogenerated files
+    - 'tmp/**/*' # git ignored anyway
 
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: single_quotes
-  Exclude:
-    - "gemfiles/**/*"
 
 Style/FrozenStringLiteralComment:
   Enabled: true
-  Exclude:
-    - "gemfiles/**/*"
 
 Style/StringLiteralsInInterpolation:
   Enabled: true

data/.solargraph.yml.example

@@ -0,0 +1,26 @@
+---
+include:
+- "**/*.rb"
+exclude:
+- "spec/solargraph/**/*"
+- test/**/*
+- vendor/**/*
+- ".bundle/**/*"
+require: []
+domains: []
+reporters:
+- typecheck:strict
+- rubocop
+- require_not_found
+formatter:
+  rubocop:
+    cops: all
+require_paths: []
+plugins:
+- solargraph-rspec
+max_files: 20000
+rspec:
+  let_methods:
+  - let_it_be
+  example_methods:
+  - my_example

data/Appraisals

@@ -2,4 +2,11 @@
 
 appraise 'default' do
   # default gems from Gemfile
+  gem 'net-imap', '~> 0.4.0' # https://github.com/lsegal/yard/issues/1629
+  gem 'actionmailer'
+  gem 'airborne'
+  gem 'rspec-rails'
+  gem 'rspec-sidekiq'
+  gem 'shoulda-matchers'
+  gem 'webmock'
 end

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Go-to-defintion/Hover for RSpec DSL methods (eg. context or it)
+
+### Changed
+- Update testing steps in developer documentation
+
 ## [0.5.3] - 2025-09-02
 
 ### Fixed
@@ -125,7 +131,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `describe` and `it` methods completion
-- memoized `let` and `let!` methods completion 
+- memoized `let` and `let!` methods completion
 - implicit and explicit `subject` methods
 - `described_class` with appropriate type inference
 - `RSpec::Matchers` methods completion

data/README.md

@@ -5,11 +5,11 @@
 [![codecov](https://codecov.io/gh/lekemula/solargraph-rspec/graph/badge.svg?token=FH7ER8ZDPW)](https://codecov.io/gh/lekemula/solargraph-rspec)
 
 
-RSpec is a testing framework of choice for many Ruby developers. But at the same time is highly dynamic and heavily relying on metaprogramming making it hard to provide accurate code completion and type inference. 
+RSpec is a testing framework of choice for many Ruby developers. But at the same time is highly dynamic and heavily relying on metaprogramming making it hard to provide accurate code completion and type inference.
 
 This gem aims to provide better support for RSpec in Solargraph and it supports the following features (completion, jump to definition and type inference 🚀):
-  - `describe` and `it` methods 
-  - memoized `let` and `let!` methods 
+  - `describe` and `it` methods
+  - memoized `let` and `let!` methods
   - `described_class` with appropriate type inference
   - implicit and explicit `subject` methods
   - one liner syntax helpers `is_expected`, `should` and `should_not` linked to the appropriate subject
@@ -110,7 +110,7 @@ Run `yard config --gem-install-yri` to generate YARD documentation automatically
 
 ## Acknowledgements
 
-This gem is inspired by the [solargraph-rails](https://github.com/iftheshoefritz/solargraph-rails) which gave me an idea of how to extend Solargraph with custom features and provided me with simple and very understandable test suite which helped me to get started with playing around with Solargraph. 
+This gem is inspired by the [solargraph-rails](https://github.com/iftheshoefritz/solargraph-rails) which gave me an idea of how to extend Solargraph with custom features and provided me with simple and very understandable test suite which helped me to get started with playing around with Solargraph.
 
 In fact, most of the code I initially wrote on [a fork](https://github.com/lekemula/solargraph-rails/tree/rspec-support) of it, but then I realized that it would make more sense to extract it into a separate gem where it could be used by non-Rails projects as well.
 
@@ -128,17 +128,23 @@ It's codebase IMO is an exemplary of how Ruby code written in a very simple PORO
 
 Code contributions are always appreciated. Feel free to fork the repo and submit pull requests. Check for open issues that could use help. Start new issues to discuss changes that have a major impact on the code or require large time commitments.
 
-Contributing is easy:
+Contributing is easy - note that this Gem uses 'appraisal' to test against RSpec 3rd party plugins without adding to the main `Gemfile`:
 1. Create a fork and clone it
-2. Run `bundle install` to install dependencies
-3. Run `yard gems` to generate YARD documentation for your installed gems
-4. Run `bundle exec spec` to run the tests
-5. Introduce your awesome changes
-6. Ensure they are well covered with tests
-7. Record your changes in the [CHANGELOG.md](./CHANGELOG.md)
-7. Submit a pull request :rocket:
+2. Verify tests are green:
+   ```sh
+   bundle install
+   bundle exec appraisal install
+   cp .solargraph.yml.example .solargraph.yml
+   bundle exec appraisal bundle exec rbs collection update
+   rspec_gems=$(bundle exec appraisal bundle exec ruby -r './lib/solargraph-rspec' -e 'puts Solargraph::Rspec::Gems.gem_names.join(" ")' 2>/dev/null | tail -n1)
+   bundle exec appraisal bundle exec solargraph gems $rspec_gems
+   bundle exec appraisal rspec
+   ```
+3. Introduce your awesome changes
+4. Ensure they are well covered with tests
+5. Record your changes in the [CHANGELOG.md](./CHANGELOG.md)
+6. Submit a pull request :rocket:
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-

data/gemfiles/default.gemfile

@@ -8,18 +8,19 @@ gem "debug"
 gem "profile-viewer"
 gem "pry-byebug"
 gem "rake"
+gem "rbs"
 gem "rspec"
 gem "rubocop"
+gem "rubocop-yard"
 gem "simplecov"
 gem "simplecov-cobertura"
-
-group :third_party_plugin_tests do
-  gem "actionmailer"
-  gem "airborne"
-  gem "rspec-rails"
-  gem "rspec-sidekiq"
-  gem "shoulda-matchers"
-  gem "webmock"
-end
+gem "unparser"
+gem "net-imap", "~> 0.4.0"
+gem "actionmailer"
+gem "airborne"
+gem "rspec-rails"
+gem "rspec-sidekiq"
+gem "shoulda-matchers"
+gem "webmock"
 
 gemspec path: "../"

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.4)
+      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,51 @@ 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.4.1)
+    bigdecimal (3.2.3)
     builder (3.3.0)
-    byebug (11.1.3)
+    byebug (12.0.0)
     coderay (1.1.3)
     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)
     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)
+    jaro_winkler (1.6.1)
+    json (2.13.2)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    language_server-protocol (3.17.0.4)
+    language_server-protocol (3.17.0.5)
     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 +113,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 +129,35 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     netrc (0.11.0)
-    nokogiri (1.17.2-arm64-darwin)
+    nokogiri (1.18.10-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 (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
-    profile-viewer (0.0.4)
+    prism (1.5.1)
+    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,31 +165,32 @@ 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 (3.9.5)
       logger
-    rdoc (6.12.0)
+    rdoc (6.14.2)
+      erb
       psych (>= 4.0.0)
-    redis-client (0.24.0)
+    redis-client (0.25.3)
       connection_pool
-    regexp_parser (2.10.0)
-    reline (0.6.0)
+    regexp_parser (2.11.3)
+    reline (0.6.2)
       io-console (~> 0.5)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
@@ -199,34 +199,34 @@ GEM
       netrc (~> 0.8)
     reverse_markdown (3.0.0)
       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.80.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -234,14 +234,19 @@ GEM
       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.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.41.0)
+    rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    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,50 +258,63 @@ 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.57.0)
+      ast (~> 2.4.3)
       backport (~> 1.2)
-      benchmark
+      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.6.1, <= 4.0.0.dev.4)
+      reverse_markdown (~> 3.0)
+      rubocop (~> 1.76)
       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)
+    stringio (3.1.7)
+    thor (1.4.0)
+    tilt (2.6.1)
     timeout (0.4.3)
     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.1.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-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-24
 
 DEPENDENCIES
@@ -305,18 +323,22 @@ DEPENDENCIES
   appraisal
   bundler
   debug
+  net-imap (~> 0.4.0)
   profile-viewer
   pry-byebug
   rake
+  rbs
   rspec
   rspec-rails
   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

@@ -34,12 +34,16 @@ 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 [Hash]

data/lib/solargraph/rspec/convention.rb

@@ -9,7 +9,7 @@ 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'
 
 module Solargraph
@@ -78,16 +78,16 @@ 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
         # TODO: Include gem requires conditionally based on Gemfile definition
-        requires = Solargraph::Rspec::TestHelpers.gem_names
+        requires = Solargraph::Rspec::Gems.gem_names
 
         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,45 @@ module Solargraph
         # @param pin [Solargraph::Pin::Base]
         # @param new_closure [Solargraph::Pin::Closure]
         def override_closure(pin, new_closure)
+          # HACK: We should only rely on public API, and avoid instance_variable_get/set.
           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
+          )
+
+          # HACK: We should only rely on public API, and avoid instance_variable_get/set.
+          closure.instance_variable_set('@location', new_location)
+        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)

data/lib/solargraph/rspec/{test_helpers.rb → gems.rb}

@@ -2,16 +2,15 @@
 
 module Solargraph
   module Rspec
-    class TestHelpers
-      class GemHelpers < Struct.new(:required_gems, :helper_modules, keyword_init: true)
-        # @!attribute [r] required_gems
-        #   @return [Array<String>]
-        # @!attribute [r] helper_modules
-        #   @return [Array<String>]
-      end
+    class Gems
+      # rubocop:disable YARD/MeaninglessTag
+      # @param required_gems [Array<String>]
+      # @param helper_modules [Array<String>]
+      # rubocop:enable YARD/MeaninglessTag
+      GemHelpers = Struct.new(:required_gems, :helper_modules, keyword_init: true)
 
       class << self
-        # @return [String]
+        # @return [Array<String>]
         def gem_names
           GEM_HELPERS.flat_map(&:required_gems)
         end
@@ -37,7 +36,7 @@ module Solargraph
 
       GEM_HELPERS = [
         GemHelpers.new(
-          required_gems: %w[rspec],
+          required_gems: %w[rspec rspec-expectations rspec-core],
           helper_modules: %w[RSpec::Matchers]
         ),
         # https://github.com/rspec/rspec-mocks
@@ -48,7 +47,7 @@ module Solargraph
         # @see https://github.com/rspec/rspec-rails#what-tests-should-i-write
         # @see https://github.com/rspec/rspec-rails#helpful-rails-matchers
         GemHelpers.new(
-          required_gems: %w[rspec-rails actionmailer activesupport activerecord],
+          required_gems: %w[rspec-rails actionmailer activesupport actionpack],
           helper_modules: [
             'RSpec::Rails::Matchers',
             'ActionController::TestCase::Behavior',

data/lib/solargraph/rspec/pin_factory.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Credits: This file was originally copied and adapted from the log_bench gem.
+# Credits: This file was originally copied and adapted from the solargraph-rails gem.
 
 module Solargraph
   module Rspec
@@ -8,11 +8,12 @@ module Solargraph
     module PinFactory
       # @param namespace [Solargraph::Pin::Namespace]
       # @param name [String]
-      # @param types [Array<String>]
-      # @param location [Solargraph::Location]
+      # @param types [Array<String>, nil]
+      # @param [Parser::AST::Node, nil] node
+      # @param location [Solargraph::Location, nil]
       # @param comments [Array<String>]
       # @param attribute [Boolean]
-      # @param scope [:instance, :class]
+      # @param scope [:instance, :class] # rubocop:disable YARD/TagTypeSyntax
       # @return [Solargraph::Pin::Method]
       def self.build_public_method(
         namespace,
@@ -42,7 +43,7 @@ module Solargraph
       end
 
       # @param namespace [Solargraph::Pin::Namespace]
-      # @param name [String]
+      # @param module_name [String]
       # @param location [Solargraph::Location]
       # @return [Solargraph::Pin::Reference::Include]
       def self.build_module_include(namespace, module_name, location)
@@ -74,10 +75,36 @@ module Solargraph
         )
       end
 
+      # Given the following code, Solargraph::Parser.node_range returns the following range for block ast:
+      #
+      # some_method_with_block do
+      # ^ - block start
+      # end
+      # ^ - block end
+      #
+      # Instead we want the range to be:
+      #
+      # some_method_with_block do
+      #                        ^ - block start
+      # end
+      # ^ - block end
+      #
       # @param ast [::Parser::AST::Node]
       # @return [Solargraph::Range]
       def self.build_location_range(ast)
-        Solargraph::Parser.node_range(ast)
+        if ast.type == :block
+          method_range = Solargraph::Parser.node_range(ast.children[0])
+          full_block_range = Solargraph::Parser.node_range(ast)
+
+          Solargraph::Range.from_to(
+            method_range.ending.line,
+            method_range.ending.character,
+            full_block_range.ending.line,
+            full_block_range.ending.character
+          )
+        else
+          Solargraph::Parser.node_range(ast)
+        end
       end
 
       # @param location_range [Solargraph::Range]

data/lib/solargraph/rspec/spec_walker/fake_let_method.rb

@@ -11,6 +11,7 @@ module Solargraph
           # Transforms let block to method ast node
           # @param block_ast [::Parser::AST::Node]
           # @return [::Parser::AST::Node, nil]
+          # @param [String, nil] method_name
           def transform_block(block_ast, method_name = nil)
             method_name ||= NodeTypes.let_method_name(block_ast)
 
@@ -22,11 +23,6 @@ module Solargraph
                 block_ast.children[2]
               ]
             )
-          rescue SyntaxError => e
-            Solargraph.logger.warn "[RSpec] Failed to build fake let method: #{e.message}, \
-            \n\nlet_definition_code: \n```\n#{let_definition_code}\n```, \
-            \n\nmethod_body: \n```\n#{method_body}\n```, \
-            \nast: #{block_ast.inspect}"
           end
         end
       end

data/lib/solargraph/rspec/spec_walker/node_types.rb

@@ -10,38 +10,40 @@ module Solargraph
           ast.is_a?(::Parser::AST::Node) && ast.type == :block
         end
 
-        # @param ast [::Parser::AST::Node]
+        # @param block_ast [::Parser::AST::Node]
         # @return [Boolean]
         def self.a_context_block?(block_ast)
           Solargraph::Rspec::CONTEXT_METHODS.include?(method_with_block_name(block_ast))
         end
 
-        # @param ast [::Parser::AST::Node]
+        # @param block_ast [::Parser::AST::Node]
         # @return [Boolean]
         def self.a_subject_block?(block_ast)
           Solargraph::Rspec::SUBJECT_METHODS.include?(method_with_block_name(block_ast))
         end
 
-        # @param ast [::Parser::AST::Node]
+        # @param block_ast [::Parser::AST::Node]
         # @param config [Config]
         # @return [Boolean]
         def self.a_example_block?(block_ast, config)
           config.example_methods.map(&:to_s).include?(method_with_block_name(block_ast))
         end
 
-        # @param ast [::Parser::AST::Node]
+        # @param block_ast [::Parser::AST::Node]
         # @param config [Config]
         # @return [Boolean]
         def self.a_let_block?(block_ast, config)
           config.let_methods.map(&:to_s).include?(method_with_block_name(block_ast))
         end
 
-        # @param ast [::Parser::AST::Node]
+        # @param block_ast [::Parser::AST::Node]
         # @return [Boolean]
         def self.a_hook_block?(block_ast)
           Solargraph::Rspec::HOOK_METHODS.include?(method_with_block_name(block_ast))
         end
 
+        # @param [::Parser::AST::Node] ast
+        # @return [Boolean]
         def self.a_constant?(ast)
           ast.type == :const
         end
@@ -56,7 +58,7 @@ module Solargraph
         end
 
         # @param block_ast [::Parser::AST::Node]
-        # @return [::Parser::AST::Node]
+        # @return [::Parser::AST::Node, nil]
         def self.context_description_node(block_ast)
           return nil unless a_context_block?(block_ast)
 
@@ -64,7 +66,7 @@ module Solargraph
         end
 
         # @param block_ast [::Parser::AST::Node]
-        # @return [String]
+        # @return [String, nil]
         def self.let_method_name(block_ast)
           return nil unless a_block?(block_ast)
 

data/lib/solargraph/rspec/spec_walker/rspec_context_namespace.rb

@@ -26,7 +26,7 @@ module Solargraph
           private
 
           # @see https://github.com/rspec/rspec-core/blob/1eeadce5aa7137ead054783c31ff35cbfe9d07cc/lib/rspec/core/example_group.rb#L862
-          # @param ast [Parser::AST::Node]
+          # @param string_ast [Parser::AST::Node]
           # @return [String]
           def string_to_const_name(string_ast)
             return unless string_ast.type == :str

data/lib/solargraph/rspec/spec_walker.rb

@@ -188,8 +188,9 @@ module Solargraph
       end
 
       # Find all describe/context blocks in the AST.
-      # @param ast [Parser::AST::Node]
       # @yield [String, Parser::AST::Node]
+      # @param [Parser::AST::Node] ast
+      # @param [String] root_namespace
       def each_context_block(ast, root_namespace = Rspec::ROOT_NAMESPACE, &block)
         each_block(ast, root_namespace) do |block_ast, parent_namespace|
           is_a_context = NodeTypes.a_context_block?(block_ast)

data/lib/solargraph/rspec/version.rb

@@ -2,6 +2,6 @@
 
 module Solargraph
   module Rspec
-    VERSION = '0.5.4'
+    VERSION = '0.5.5'
   end
 end

data/lib/solargraph/rspec/walker.rb

@@ -54,6 +54,7 @@ module Solargraph
         end
 
         # @param children [Array<::Parser::AST::Node>]
+        # @param args [Array]
         def match_children(children, args = @args)
           args.each_with_index.all? do |arg, i|
             if arg == :any

data/rbs_collection.yaml

@@ -0,0 +1,20 @@
+
+# Download sources
+sources:
+  - type: git
+    name: ruby/gem_rbs_collection
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    revision: main
+    repo_dir: gems
+
+# You can specify local directories as sources also.
+# - type: local
+#   path: path/to/your/local/repository
+
+# A directory to install the downloaded RBSs
+path: .gem_rbs_collection
+
+# gems:
+#   # If you want to avoid installing rbs files for gems, you can specify them here.
+#   - name: GEM_NAME
+#     ignore: true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solargraph-rspec
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Lekë Mula
 bindir: exe
 cert_chain: []
-date: 2025-09-06 00:00:00.000000000 Z
+date: 2025-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solargraph
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".rubocop.yml"
+- ".solargraph.yml.example"
 - Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -54,16 +55,17 @@ files:
 - lib/solargraph/rspec/correctors/example_and_hook_blocks_binding_corrector.rb
 - lib/solargraph/rspec/correctors/let_methods_corrector.rb
 - lib/solargraph/rspec/correctors/subject_method_corrector.rb
+- lib/solargraph/rspec/gems.rb
 - lib/solargraph/rspec/pin_factory.rb
 - lib/solargraph/rspec/spec_walker.rb
 - lib/solargraph/rspec/spec_walker/fake_let_method.rb
 - lib/solargraph/rspec/spec_walker/full_constant_name.rb
 - lib/solargraph/rspec/spec_walker/node_types.rb
 - lib/solargraph/rspec/spec_walker/rspec_context_namespace.rb
-- lib/solargraph/rspec/test_helpers.rb
 - lib/solargraph/rspec/version.rb
 - lib/solargraph/rspec/walker.rb
 - lib/solargraph_rspec.rb
+- rbs_collection.yaml
 - release_gem.sh
 - sig/solargraph/rspec.rbs
 - solargraph-rspec.gemspec