solargraph-rspec 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e92fa0735bc1e0b1129ce3c06208969dd8917a28e70286876d7f6307928e8c
-  data.tar.gz: 718485f0ea53780cb3ee6d076cb5be112d160d1c39866c91334142d1abff515a
+  metadata.gz: 25d0ca1f34e0cf80057b86a412ec10cbacba388a96bd5b5e7b93f64457616e5a
+  data.tar.gz: d1b4b825f9df08a3333bab32d2af05a9cc6a48cd7903f5b4504baba1e775a960
 SHA512:
-  metadata.gz: '06580663bc8c5424219a171e4f61121d98d04dfe9048bfaa3595c7717bdd2a88b6dcd5055218cbf2fe3c50f7ade5a148811a7c23b780c86d9f0bae8ea554a236'
-  data.tar.gz: 28ea8fe4be4f3402ca3079a747764013d6154adac0b114c2f9f23afe81599b403f0bb024856c3744ce7e8b64f80898eba210962cec68253e0edf25c90f3ce1d6
+  metadata.gz: 1d7efb9da09a862654e5bb4fbd70bb983230cae9303e98ebc487cb0f00afe752ba8c936513dc23aac153e99f49d607b93111aada2f235fb47fdbeefcb81a0acb
+  data.tar.gz: aa9563e0d56a8ab37b45a739f6394e47e7dd597bc59bfb205a043ed41d9b5c47bc08b7a8184225ed75f2840bd57aeedd96ed05f325d32700c54e81aafb3e39d3

data/CHANGELOG.md

@@ -7,7 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-- 
+
+## [0.2.1] - 2024-06-09
+
+### Added
+
+- Documentation for `RSpec::ExampleGroups` DSL methods like `it`, `fit`, `example` etc.
+
+### Fixed
+
+- Fix nameless `subject` method completion inside nested `context` blocks
+- (Hack-ish) Fix `described_class` type collision when `RSpec.describe SomeClassWithoutNamespace`
+
+## [0.2.0] - 2024-05-20
+
+### Added
+
+- `let` and `subject` type inference 🚀 (Resolves: [Issue #1](https://github.com/lekemula/solargraph-rspec/issues/1))
+
+### Changed
+
+- Migrate from `parser` gem to using ruby's built-in RubyVM::AbstractSyntaxTree ([see why](https://github.com/castwide/solargraph/issues/522#issuecomment-993016664))
+
+### Fixed
+
+- Fix subject without name block completion: `subject { ... }`
+- Fix subject return class overlap with `Rspec::ExampleGroups::` when class has no namespace
 
 ## [0.1.1] - 2024-05-13
 

data/README.md

@@ -7,15 +7,18 @@
 
 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 a better support for RSpec in Solargraph and it supports the following features:
+This gem aims to provide better support for RSpec in Solargraph and it supports the following features:
   - `describe` and `it` methods completion
   - memoized `let` and `let!` methods completion 
   - implicit and explicit `subject` methods
   - `described_class` with appropriate type inference
   - `RSpec::Matchers` methods completion
+  - type inference 🚀
   - and more to come...
 
-  ![solargraph-rspec_smaller](https://github.com/lekemula/solargraph-rspec/assets/9197495/66f86e5b-258e-4d8c-8a64-0685d15ece00)
+![solargraph-rspec-with-types](https://github.com/lekemula/solargraph-rspec/assets/9197495/077e74f8-a800-4e90-8922-fa5351adcda3)
+![solargraph-rspec-with-types-vs-code](https://github.com/lekemula/solargraph-rspec/assets/9197495/6a942460-256d-46ca-82de-9869a65309ec)
+
 
 ## Installation
 

data/codecov.yml

@@ -0,0 +1,13 @@
+# https://docs.codecov.com/docs/common-recipe-list
+coverage:
+  status:
+    project: #add everything under here, more options at https://docs.codecov.com/docs/commit-status
+      default:
+        # basic
+        target: auto #default
+        threshold: 1%
+        base: auto
+        informational: true
+    patch:
+      default:
+        informational: true

data/lib/solargraph/rspec/convention.rb

@@ -8,9 +8,8 @@ require_relative 'correctors/described_class_corrector'
 require_relative 'correctors/let_methods_corrector'
 require_relative 'correctors/subject_method_corrector'
 require_relative 'correctors/context_block_methods_corrector'
-require_relative 'correctors/implicit_subject_method_corrector'
 require_relative 'correctors/dsl_methods_corrector'
-require_relative 'util'
+require_relative 'pin_factory'
 
 module Solargraph
   module Rspec
@@ -50,6 +49,17 @@ module Solargraph
       include_context
     ].freeze
 
+    # @type [Array<Class<Correctors::Base>>]
+    CORRECTOR_CLASSES = [
+      Correctors::ContextBlockMethodsCorrector,
+      Correctors::ContextBlockNamespaceCorrector,
+      Correctors::DescribedClassCorrector,
+      Correctors::DslMethodsCorrector,
+      Correctors::ExampleAndHookBlocksBindingCorrector,
+      Correctors::LetMethodsCorrector,
+      Correctors::SubjectMethodCorrector
+    ].freeze
+
     # Provides completion for RSpec DSL and helper methods.
     #   - `describe` and `context` blocks
     #   - `let` and `let!` methods
@@ -105,77 +115,17 @@ module Solargraph
 
         rspec_walker = SpecWalker.new(source_map: source_map, config: config)
 
-        Correctors::ContextBlockNamespaceCorrector.new(
-          namespace_pins: namespace_pins,
-          rspec_walker: rspec_walker
-        ).correct(source_map) do |pins_to_add|
-          pins += pins_to_add
-        end
-
-        Correctors::ExampleAndHookBlocksBindingCorrector.new(
-          namespace_pins: namespace_pins,
-          rspec_walker: rspec_walker
-        ).correct(source_map) do |pins_to_add|
-          pins += pins_to_add
-        end
-
-        # @type [Pin::Method, nil]
-        described_class_pin = nil
-        Correctors::DescribedClassCorrector.new(namespace_pins: namespace_pins, rspec_walker: rspec_walker).correct(
-          source_map
-        ) do |pins_to_add|
-          described_class_pin = pins_to_add.first
-          pins += pins_to_add
-        end
-
-        Correctors::LetMethodsCorrector.new(namespace_pins: namespace_pins, rspec_walker: rspec_walker).correct(
-          source_map
-        ) do |pins_to_add|
-          pins += pins_to_add
-        end
-
-        # @type [Pin::Method, nil]
-        subject_pin = nil
-        Correctors::SubjectMethodCorrector.new(namespace_pins: namespace_pins, rspec_walker: rspec_walker).correct(
-          source_map
-        ) do |pins_to_add|
-          subject_pin = pins_to_add.first
-          pins += pins_to_add
-        end
-
-        Correctors::ContextBlockMethodsCorrector.new(
-          namespace_pins: namespace_pins,
-          rspec_walker: rspec_walker
-        ).correct(source_map) do |pins_to_add|
-          pins += pins_to_add
-        end
-
-        Correctors::DslMethodsCorrector.new(
-          namespace_pins: namespace_pins,
-          rspec_walker: rspec_walker,
-          config: config
-        ).correct(
-          source_map
-        ) do |pins_to_add|
-          pins += pins_to_add
+        CORRECTOR_CLASSES.each do |corrector_class|
+          corrector_class.new(
+            namespace_pins: namespace_pins,
+            rspec_walker: rspec_walker,
+            added_pins: pins
+          ).correct(source_map)
         end
 
         rspec_walker.walk!
         pins += namespace_pins
 
-        # Implicit subject
-        if !subject_pin && described_class_pin
-          Correctors::ImplicitSubjectMethodCorrector.new(
-            namespace_pins: namespace_pins,
-            described_class_pin: described_class_pin
-          ).correct(
-            source_map
-          ) do |pins_to_add|
-            subject_pin = pins_to_add.first
-            pins += pins_to_add
-          end
-        end
-
         if pins.any?
           Solargraph.logger.debug(
             "[RSpec] added #{pins.map(&:inspect)} to #{source_map.filename}"
@@ -199,7 +149,7 @@ module Solargraph
       # @return [Array<Pin::Base>]
       def include_helper_pins(helper_modules: HELPER_MODULES)
         helper_modules.map do |helper_module|
-          Util.build_module_include(
+          PinFactory.build_module_include(
             root_example_group_namespace_pin,
             helper_module,
             root_example_group_namespace_pin.location
@@ -216,7 +166,7 @@ module Solargraph
       def root_example_group_namespace_pin
         Solargraph::Pin::Namespace.new(
           name: ROOT_NAMESPACE,
-          location: Util.dummy_location('lib/rspec/core/example_group.rb')
+          location: PinFactory.dummy_location('lib/rspec/core/example_group.rb')
         )
       end
     end

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

@@ -9,13 +9,22 @@ module Solargraph
         # @return [Array<Solargraph::Pin::Namespace>]
         attr_reader :namespace_pins
 
+        # @return [Solargraph::Rspec::SpecWalker]
+        attr_reader :rspec_walker
+
+        # @return [Array<Solargraph::Pin::Base]
+        attr_reader :added_pins
+
         # @param namespace_pins [Array<Solargraph::Pin::Base>]
-        def initialize(namespace_pins:)
+        # @param rspec_walker [Solargraph::Rspec::SpecWalker]
+        # @param added_pins [Array<Solargraph::Pin::Base>]
+        def initialize(namespace_pins:, rspec_walker:, added_pins: [])
           @namespace_pins = namespace_pins
+          @rspec_walker = rspec_walker
+          @added_pins = added_pins
         end
 
         # @param _source_map [Solargraph::SourceMap]
-        # @yield [Array<Solargraph::Pin::Base>] Pins to be added to the source map
         # @return [void]
         def correct(_source_map)
           raise NotImplementedError
@@ -23,11 +32,25 @@ module Solargraph
 
         private
 
+        # @param pin [Solargraph::Pin::Base, nil]
+        # @return [void]
+        def add_pin(pin)
+          return unless pin
+
+          added_pins.push(pin)
+        end
+
+        # @param pins [Array<Solargraph::Pin::Base>]
+        # @return [void]
+        def add_pins(*pins)
+          added_pins.concat(pins.flatten.compact)
+        end
+
         # @return [Solargraph::Pin::Namespace]
         def root_example_group_namespace_pin
           Solargraph::Pin::Namespace.new(
             name: ROOT_NAMESPACE,
-            location: Util.dummy_location('lib/rspec/core/example_group.rb')
+            location: PinFactory.dummy_location('lib/rspec/core/example_group.rb')
           )
         end
 

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

@@ -6,7 +6,7 @@ module Solargraph
   module Rspec
     module Correctors
       # A corrector that corrects pure ruby method blocks namespace defined inside describe/context blocks.
-      class ContextBlockMethodsCorrector < WalkerBase
+      class ContextBlockMethodsCorrector < Base
         # @param source_map [Solargraph::SourceMap]
         def correct(source_map)
           rspec_walker.after_walk do
@@ -28,8 +28,6 @@ module Solargraph
                 comments: pin.comments
               )
             end
-
-            yield [] if block_given?
           end
         end
       end

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

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-require_relative 'walker_base'
+require_relative 'base'
 
 module Solargraph
   module Rspec
     module Correctors
-      # A corrector of RSpec parsed pins by Solargraph
-      class ContextBlockNamespaceCorrector < WalkerBase
+      # RSpec generates a namespace class for each context block. This corrector add the pins for those namespaces.
+      class ContextBlockNamespaceCorrector < Base
         # @param source_map [Solargraph::SourceMap]
         def correct(source_map)
-          rspec_walker.on_each_context_block do |namespace_name, ast|
-            original_block_pin = source_map.locate_block_pin(ast.location.begin.line, ast.location.begin.column)
+          # @param location_range [Solargraph::Range]
+          rspec_walker.on_each_context_block do |namespace_name, location_range|
+            original_block_pin = source_map.locate_block_pin(location_range.start.line, location_range.start.column)
             original_block_pin_index = source_map.pins.index(original_block_pin)
-            location = Util.build_location(ast, source_map.filename)
+            location = PinFactory.build_location(location_range, source_map.filename)
 
             # Define a dynamic module for the example group block
             # Example:
@@ -36,7 +37,7 @@ module Solargraph
 
             # Include DSL methods in the example group block
             # TOOD: This does not work on solagraph! Class methods are not included from parent class.
-            namespace_extend_pin = Util.build_module_extend(
+            namespace_extend_pin = PinFactory.build_module_extend(
               namespace_pin,
               root_example_group_namespace_pin.name,
               location
@@ -44,19 +45,15 @@ module Solargraph
 
             # Include parent example groups to share let definitions
             parent_namespace_name = namespace_name.split('::')[0..-2].join('::')
-            namespace_include_pin = Util.build_module_include(
+            namespace_include_pin = PinFactory.build_module_include(
               namespace_pin,
               parent_namespace_name,
               location
             )
 
             namespace_pins << namespace_pin
-            if block_given?
-              yield [
-                namespace_include_pin,
-                namespace_extend_pin
-              ]
-            end
+
+            add_pins(namespace_extend_pin, namespace_include_pin)
           end
         end
       end

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

@@ -1,35 +1,36 @@
 # frozen_string_literal: true
 
-require_relative 'walker_base'
+require_relative 'base'
 
 module Solargraph
   module Rspec
     module Correctors
-      class DescribedClassCorrector < WalkerBase
+      # Defines `described_class` method in the example group block
+      class DescribedClassCorrector < Base
         # @param source_map [Solargraph::SourceMap]
         # @return [void]
         def correct(_source_map)
-          rspec_walker.on_described_class do |ast, described_class_name|
-            namespace_pin = closest_namespace_pin(namespace_pins, ast.loc.line)
+          rspec_walker.on_described_class do |described_class_name, location_range|
+            namespace_pin = closest_namespace_pin(namespace_pins, location_range.start.line)
             next unless namespace_pin
 
-            described_class_pin = rspec_described_class_method(namespace_pin, ast, described_class_name)
-            yield [described_class_pin].compact if block_given?
+            described_class_pin = rspec_described_class_method(namespace_pin, location_range, described_class_name)
+            add_pin(described_class_pin)
           end
         end
 
         private
 
         # @param namespace [Pin::Namespace]
-        # @param ast [Parser::AST::Node]
+        # @param location_range [Solargraph::Range]
         # @param described_class_name [String]
         # @return [Pin::Method, nil]
-        def rspec_described_class_method(namespace, ast, described_class_name)
-          Util.build_public_method(
+        def rspec_described_class_method(namespace, location_range, described_class_name)
+          PinFactory.build_public_method(
             namespace,
             'described_class',
-            types: ["Class<#{described_class_name}>"],
-            location: Util.build_location(ast, namespace.filename),
+            types: ["Class<::#{described_class_name}>"],
+            location: PinFactory.build_location(location_range, namespace.filename),
             scope: :instance
           )
         end

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

@@ -1,44 +1,47 @@
 # frozen_string_literal: true
 
-require_relative 'walker_base'
+require_relative 'base'
+require 'yard'
 
 module Solargraph
   module Rspec
     module Correctors
-      class DslMethodsCorrector < WalkerBase
-        # @param namespace_pins [Array<Solargraph::Pin::Base>]
-        # @param rspec_walker [Solargraph::Rspec::SpecWalker]
-        # @param config [Solargraph::Rspec::Config]
-        def initialize(namespace_pins:, rspec_walker:, config:)
-          super(namespace_pins: namespace_pins, rspec_walker: rspec_walker)
-          @config = config
+      # Includes DSL method helpers in the example group block for completion (ie. it, before, let, subject, etc.)
+      class DslMethodsCorrector < Base
+        # @return [Array<YARD::CodeObjects::Base>]
+        def self.rspec_yardoc_tags
+          @rspec_yardoc_tags ||= begin
+            spec = Gem::Specification.find_by_name('rspec-core')
+            require_paths = spec.require_paths.map { |path| File.join(spec.full_gem_path, path) }
+            Solargraph.logger.debug "[RSpec] Loading YARD registry for rspec-core from #{require_paths}"
+            YARD::Registry.load(require_paths, true)
+            YARD::Registry.all
+          end
         end
 
         # @param source_map [Solargraph::SourceMap]
         # @return [void]
         def correct(_source_map)
           rspec_walker.after_walk do
-            if block_given?
-              yield namespace_pins.flat_map { |namespace_pin| add_context_dsl_methods(namespace_pin) }
-              yield namespace_pins.flat_map { |namespace_pin| add_methods_with_example_binding(namespace_pin) }
+            namespace_pins.each do |namespace_pin|
+              add_pins(context_dsl_methods(namespace_pin))
+              add_pins(methods_with_example_binding(namespace_pin))
             end
           end
         end
 
         private
 
-        # @return [Solargraph::Rspec::Config]
-        attr_reader :config
-
         # RSpec executes example and hook blocks (eg. it, before, after)in the context of the example group.
-        # @yieldsef changes the binding of the block to correct class.
+        # Tag @yieldsef changes the binding of the block to correct class.
         # @return [Array<Solargraph::Pin::Method>]
-        def add_methods_with_example_binding(namespace_pin)
+        def methods_with_example_binding(namespace_pin)
           rspec_context_block_methods.map do |method|
-            Util.build_public_method(
+            # TODO: Add location from YARD registry and documentation for other methods not just example group methods.
+            PinFactory.build_public_method(
               namespace_pin,
               method.to_s,
-              comments: ["@yieldself [#{namespace_pin.path}]"], # Fixes the binding of the block to the correct class
+              comments: [example_group_documentation(method), "@yieldself [#{namespace_pin.path}]"],
               scope: :class
             )
           end
@@ -48,9 +51,9 @@ module Solargraph
         #   Fix this once Solargraph supports extending class methods.
         # @param namespace_pin [Solargraph::Pin::Base]
         # @return [Array<Solargraph::Pin::Base>]
-        def add_context_dsl_methods(namespace_pin)
+        def context_dsl_methods(namespace_pin)
           Rspec::CONTEXT_METHODS.map do |method|
-            Util.build_public_method(
+            PinFactory.build_public_method(
               namespace_pin,
               method.to_s,
               scope: :class
@@ -58,10 +61,36 @@ module Solargraph
           end
         end
 
+        # @param method [String]
+        # @return [String]
+        def example_group_documentation(method)
+          return unless Rspec::EXAMPLE_METHODS.include?(method)
+
+          yardoc = rspec_yardoc_tags_at("RSpec::Core::ExampleGroup.#{method}")
+
+          unless yardoc
+            Solargraph.logger.warn "[RSpec] YARD documentation not found for RSpec::Core::ExampleGroup.#{method}"
+            return
+          end
+
+          yardoc.docstring.all
+        end
+
+        # @param method [String]
+        # @return [YARD::CodeObjects::MethodObject, nil]
+        def rspec_yardoc_tags_at(method_path)
+          self.class.rspec_yardoc_tags.find { |tag| tag.path == method_path }
+        end
+
         # @return [Array<String>]
         def rspec_context_block_methods
           config.let_methods + Rspec::HOOK_METHODS + Rspec::EXAMPLE_METHODS
         end
+
+        # @return [Solargraph::Rspec::Config]
+        def config
+          Solargraph::Rspec::Convention.config
+        end
       end
     end
   end

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

@@ -1,58 +1,48 @@
 # frozen_string_literal: true
 
-require_relative 'walker_base'
+require_relative 'base'
 
 module Solargraph
   module Rspec
     module Correctors
-      # Sets the correct namespace binding for example group blocks (it, example, etc.) and
-      # hook blocks (before, after, around)
-      class ExampleAndHookBlocksBindingCorrector < WalkerBase
+      # RSpec executes example and hook blocks in the context of the example group (ie. describe blocks).
+      # This correctors sets the right bindings to those blocks.
+      class ExampleAndHookBlocksBindingCorrector < Base
         # @param source_map [Solargraph::SourceMap]
         # @return [void]
         def correct(source_map)
-          rspec_walker.on_example_block do |block_ast|
-            bind_closest_namespace(block_ast, source_map)
-
-            yield [] if block_given?
+          rspec_walker.on_example_block do |location_range|
+            bind_closest_namespace(location_range, source_map)
           end
 
-          rspec_walker.on_hook_block do |block_ast|
-            bind_closest_namespace(block_ast, source_map)
-
-            yield [] if block_given?
+          rspec_walker.on_hook_block do |location_range|
+            bind_closest_namespace(location_range, source_map)
           end
 
-          rspec_walker.on_let_method do |let_method_ast|
-            bind_closest_namespace(let_method_ast, source_map)
-
-            yield [] if block_given?
+          rspec_walker.on_let_method do |_method_name, location_range|
+            bind_closest_namespace(location_range, source_map)
           end
 
-          rspec_walker.on_blocks_in_examples do |block_ast|
-            bind_closest_namespace(block_ast, source_map)
-
-            yield [] if block_given?
+          rspec_walker.on_blocks_in_examples do |location_range|
+            bind_closest_namespace(location_range, source_map)
           end
 
-          rspec_walker.on_subject do |subject_ast|
-            bind_closest_namespace(subject_ast, source_map)
-
-            yield [] if block_given?
+          rspec_walker.on_subject do |_method_name, location_range|
+            bind_closest_namespace(location_range, source_map)
           end
         end
 
         private
 
-        # @param block_ast [Parser::AST::Node]
+        # @param location_range [Solargraph::Range]
         # @param source_map [Solargraph::SourceMap]
         # @return [void]
-        def bind_closest_namespace(block_ast, source_map)
-          namespace_pin = closest_namespace_pin(namespace_pins, block_ast.loc.line)
+        def bind_closest_namespace(location_range, source_map)
+          namespace_pin = closest_namespace_pin(namespace_pins, location_range.start.line)
           return unless namespace_pin
 
-          original_block_pin = source_map.locate_block_pin(block_ast.location.begin.line,
-                                                           block_ast.location.begin.column)
+          original_block_pin = source_map.locate_block_pin(location_range.start.line,
+                                                           location_range.start.column)
           original_block_pin_index = source_map.pins.index(original_block_pin)
           fixed_namespace_block_pin = Solargraph::Pin::Block.new(
             closure: example_run_method(namespace_pin),
@@ -67,7 +57,7 @@ module Solargraph
         # @param namespace_pin [Solargraph::Pin::Namespace]
         # @return [Solargraph::Pin::Method]
         def example_run_method(namespace_pin)
-          Util.build_public_method(
+          PinFactory.build_public_method(
             namespace_pin,
             'run',
             # https://github.com/rspec/rspec-core/blob/main/lib/rspec/core/example.rb#L246

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

@@ -1,40 +1,38 @@
 # frozen_string_literal: true
 
-require_relative 'walker_base'
+require_relative 'base'
 
 module Solargraph
   module Rspec
     module Correctors
       # Defines let-like methods in the example group block
-      class LetMethodsCorrector < WalkerBase
+      class LetMethodsCorrector < Base
         # @param source_map [Solargraph::SourceMap]
         # @return [void]
         def correct(_source_map)
-          rspec_walker.on_let_method do |ast|
-            namespace_pin = closest_namespace_pin(namespace_pins, ast.loc.line)
+          rspec_walker.on_let_method do |let_name, location_range, fake_method_ast|
+            namespace_pin = closest_namespace_pin(namespace_pins, location_range.start.line)
             next unless namespace_pin
 
-            pin = rspec_let_method(namespace_pin, ast)
-            yield [pin] if block_given?
+            pin = rspec_let_method(namespace_pin, let_name, location_range, fake_method_ast)
+            add_pin(pin)
           end
         end
 
         private
 
         # @param namespace [Pin::Namespace]
-        # @param ast [Parser::AST::Node]
+        # @param method_name [String]
+        # @param node [RubyVM::AbstractSyntaxTree::Node]
         # @param types [Array<String>, nil]
         # @return [Pin::Method, nil]
-        def rspec_let_method(namespace, ast, types: nil)
-          return unless ast.children
-          return unless ast.children[2]&.children
-
-          method_name = ast.children[2].children[0]&.to_s or return
-          Util.build_public_method(
+        def rspec_let_method(namespace, method_name, location_range, node = nil, types: nil)
+          PinFactory.build_public_method(
             namespace,
             method_name,
+            node: node,
             types: types,
-            location: Util.build_location(ast, namespace.filename),
+            location: PinFactory.build_location(location_range, namespace.filename),
             scope: :instance
           )
         end